http://alcopop.org/me/openid/
b683c70b44
update with examples
2008-11-29 10:19:26 -05:00
http://alcopop.org/me/openid/
13d938d351
behaviour of inline with meta-provided times
2008-11-29 09:06:04 -05:00
Joey Hess
91cb55d96b
Correct --dumpsetup to include the srcdir in the setup file.
1997-08-14 08:31:42 -04:00
http://thm.id.fedoraproject.org/
0c666558e4
2008-11-26 08:58:52 -05:00
https://brian.may.myopenid.com//
1fe1d1de1c
more details
2008-11-23 22:34:22 -05:00
https://brian.may.myopenid.com//
c807d043aa
more details
2008-11-23 22:20:54 -05:00
https://brian.may.myopenid.com//
8adc460bb1
Update to CSV link issue
2008-11-23 19:51:20 -05:00
http://smcv.pseudorandom.co.uk/
61415acfb8
Unbalanced </p> appears in some situations, particularly with htmltidy
2008-11-22 13:38:02 -05:00
https://brian.may.myopenid.com//
37648a4c09
links broken in CSV files
2008-11-22 03:54:48 -05:00
http://www.cse.unsw.edu.au/~willu/
3c9c348578
Client side cookie detection with javascript?
2008-11-19 00:10:10 -05:00
Joey Hess
19e34cb62e
respond, sheesh
2008-11-18 12:56:02 -05:00
http://mjr.towers.org.uk/
447d3ae258
Further details
2008-11-18 08:20:30 -05:00
intrigeri
521d76e508
pagetitle vs meta: announcing a working prototype
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 01:10:09 +01:00
Joey Hess
6611f3a2d9
bzr: Fix dates for recentchanges.
2008-11-11 13:44:47 -05:00
bcdugga
ebd9f4ce8a
2008-11-11 00:23:20 -05:00
http://josephturian.blogspot.com/
32b86c5f5b
2008-11-07 11:21:04 -05:00
Joey Hess
11d377af81
txt: Do not encode quotes when filtering the txt, as that broke later parsing of any directives on the page.
2008-11-06 20:49:18 -05:00
Joey Hess
96d52b82ed
response
2008-11-06 16:12:16 -05:00
Joey Hess
db5ea4d4f0
meta: Plugin is now enabled by default since the basewiki uses it.
2008-11-06 16:08:11 -05:00
http://josephturian.blogspot.com/
dc8929e2f0
2008-11-06 15:52:27 -05:00
Joey Hess
3689d28f3a
response
2008-11-06 13:56:41 -05:00
http://alcopop.org/me/openid/
98ffa6e155
2008-11-06 10:17:18 -05:00
http://mjr.towers.org.uk/
81846ef42e
New bug report
2008-11-06 09:27:47 -05:00
Thomas Schwinge
c67c35e897
Undo too much quoting.
2008-11-04 11:22:30 +01:00
Thomas Schwinge
d0c2f1b44d
Bug in the txt plugin.
2008-11-04 11:20:26 +01:00
intrigeri
1a4c6b5fcf
notes and wiki-gardening about pagetitle vs. meta title
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-03 01:35:36 +01:00
Joey Hess
354d22e27b
don't rely on plugin load order when determining generated directives
...
Instead, shortcuts will explicitly be marked as such when registered, and
listdirectives can filter them out.
2008-10-30 13:41:19 -04:00
http://www.cse.unsw.edu.au/~willu/
1be6b0a627
Note on fix
2008-10-29 20:02:02 -04:00
Joey Hess
3b8740ebee
response
2008-10-29 18:06:00 -04:00
https://yag.myopenid.com//
95a1d0f436
Clarified my question about selectively disabling backlinks.
2008-10-29 15:30:53 -04:00
https://yag.myopenid.com//
06e57cd569
I'm not sure whether I understand this "raw_enabled" setting in the context of rst.
2008-10-29 15:18:19 -04:00
Joey Hess
33a0e84ddb
fix preview of shortcuts
...
Move shortcut processing back to checkconfig, and avoid it failing if the
srcdir is not defined.
2008-10-29 14:20:31 -04:00
Jason Blevins
f4f099e88e
Bug report re shortcuts during preview
2008-10-28 21:43:44 -04:00
https://brian.may.myopenid.com//
b7c9682b32
fix typo.
2008-10-25 22:53:55 -04:00
https://brian.may.myopenid.com//
ecd60221ff
add my name
2008-10-25 22:52:09 -04:00
https://brian.may.myopenid.com//
b522c708f0
Replace weirdness section with link to Debian bug report.
2008-10-25 22:51:05 -04:00
https://brian.may.myopenid.com//
c231adc738
minor change
2008-10-25 22:33:31 -04:00
https://brian.may.myopenid.com//
450045d703
add link to Debian bug report.
2008-10-25 22:32:27 -04:00
https://brian.may.myopenid.com//
2e85da8e11
improve formatting
2008-10-25 22:27:04 -04:00
https://brian.may.myopenid.com//
697c54acc5
solution?
2008-10-25 22:08:29 -04:00
https://brian.may.myopenid.com//
04a9bda1e6
attach patch for http/https proxy support
2008-10-25 21:48:36 -04:00
http://jblevins.org/
f635ff0d29
htmlscrubber patch for sanitizing SVG and MathML
2008-10-21 11:12:12 -04:00
Joey Hess
dc9cb095d1
response2
2008-10-20 21:54:24 -04:00
Joey Hess
59ef1ebe5d
response
2008-10-20 21:51:33 -04:00
AndrewGreenberg
cc311beef3
Added "SVG aren't images" bug.
2008-10-20 21:34:02 -04:00
intrigeri
ee166d1b6d
fixes confirmed
2008-10-20 08:53:36 -04:00
Joey Hess
423fae6f18
Use the pure perl Data::Dumper when generating setup files to ensure that utf-8 characters are written out as such, and not as the encoded perl strings the C Data::Dumper produces.
...
Note that the text produced by the C version was interpreted fine
when ikiwiki loaded the setup file. But it was not user-friendly.
2008-10-19 21:23:48 -04:00
Joey Hess
3e992b758b
Fix issue with utf-8 in wikiname breaking session cookies, by entity-encoding the wikiname in the session cookie.
2008-10-19 21:07:12 -04:00
Joey Hess
2b569f99d9
fix relativedate timezone inclusion
...
The machine parseable date needs to include a timezone.
Also, simplified the interface for date display.
2008-10-19 19:21:44 -04:00
intrigeri
e32c6e4725
initial bug report
2008-10-19 18:19:14 -04:00
intrigeri
b637f7f700
initial bug report
2008-10-19 18:13:47 -04:00
Joey Hess
3f922abff4
remove old dup div
2008-10-18 19:11:57 -04:00
http://jblevins.org/
e49a745fdd
Unclosed div
2008-10-18 15:36:18 -04:00
Joey Hess
594243d615
update
2008-10-17 21:59:27 -04:00
Joey Hess
35c56622ea
tweak recentchanges permalink code
...
Need to handle the case where url is not set.
2008-10-17 21:54:42 -04:00
http://jblevins.org/
3690864e2b
Patch for anchor-based change permalinks in recent changes feed
2008-10-17 19:52:42 -04:00
Joey Hess
0517f9126c
close
2008-10-15 23:50:20 -04:00
Joey Hess
995d91675e
rm
2008-10-15 23:47:12 -04:00
neale
594df81c54
Joey's right, that's good enough.
2008-10-15 23:14:31 -04:00
neale
c2bff24c65
Oh well.
2008-10-15 23:13:40 -04:00
neale
0543e59eca
ahh
2008-10-15 23:12:25 -04:00
neale
9ae956e829
2008-10-15 22:30:36 -04:00
neale
0414c629b6
2008-10-15 22:29:29 -04:00
neale
9cd1ddce79
2008-10-15 22:28:42 -04:00
Joey Hess
020eb6f294
response
2008-10-15 19:32:39 -04:00
Joey Hess
063cacce39
response
2008-10-15 19:12:59 -04:00
neale
9ae8774540
2008-10-15 17:58:14 -04:00
Joey Hess
559c0707ae
response
2008-10-14 15:02:12 -04:00
Joey Hess
c39112e6ef
inline: Allow MTIME to be used in inlinepage.tmpl.
2008-10-14 15:00:46 -04:00
http://per.bothner.myopenid.com/
a75a0dd1dc
Suggested patch.
2008-10-12 16:31:24 -04:00
http://per.bothner.myopenid.com/
de805e0f39
2008-10-12 16:16:06 -04:00
http://yag.myopenid.com/
7ac2b6a6ca
2008-10-11 10:43:01 -04:00
https://yag.myopenid.com//
1dc7aa1a3e
2008-10-09 17:51:51 -04:00
https://yag.myopenid.com//
72d93d447c
2008-10-09 17:43:27 -04:00
https://yag.myopenid.com//
954e228ad6
2008-10-09 17:37:24 -04:00
Joey Hess
0b89d44233
rename
2008-10-02 17:42:33 -04:00
Joey Hess
c885a0107b
this is a wishlist todo item, rename too
2008-10-02 15:12:57 -04:00
Joey Hess
c22c010e16
response
2008-10-02 15:11:17 -04:00
Joey Hess
0b1b72b2ee
thoughts
2008-10-02 15:01:03 -04:00
Joey Hess
a1f4a9c5c9
ping
2008-10-02 14:54:52 -04:00
Joey Hess
6055dd3ef2
close
2008-10-02 14:53:11 -04:00
Joey Hess
605ce02710
move to todo, response
2008-10-02 14:51:21 -04:00
Joey Hess
5c2309ada8
typo
2008-10-02 14:49:40 -04:00
Joey Hess
d30a7b1268
fix bug closure
2008-10-02 14:48:35 -04:00
Joey Hess
bf386e22f5
inline: Fix handling of rootpage that doesn't exist.
...
It makes sense to use bestlink to determine which page rootpage refers to,
but if no page matches, just use the raw value.
2008-10-01 17:29:03 -04:00
Plareplane
8e77b66aae
2008-10-01 17:01:58 -04:00
Joey Hess
4a2b401fd0
interesting bug
2008-09-30 15:16:45 -04:00
http://josephturian.blogspot.com/
9b27983808
2008-09-29 00:03:23 -04:00
chrysn
714de9f101
response
2008-09-28 05:47:20 -04:00
Joey Hess
2ff3c8aee7
editpage: Be more aggressive (and less buggy) about cleaning up temporary files rendered during page preview.
2008-09-27 18:02:33 -04:00
Joey Hess
8d04a1de61
thoughts
2008-09-27 16:15:16 -04:00
Plareplane
6817a794a4
2008-09-27 15:23:49 -04:00
http://smcv.pseudorandom.co.uk/
6d98b2265e
2008-09-27 14:14:27 -04:00
Joey Hess
3b39e93699
Beautify urls used in various places. (smcv)
2008-09-27 13:03:21 -04:00
Joey Hess
f181962dfc
typo
2008-09-27 12:50:39 -04:00
intrigeri
f9a000b24b
2008-09-27 12:40:26 -04:00
Joey Hess
83429adf04
decode utf-8 in recentchanges_link parameter
2008-09-26 15:40:01 -04:00
chrysn
1d12dfc57c
update: possible solution
2008-09-26 12:44:09 -04:00
chrysn
947a50fe5d
some problem remains
2008-09-26 09:05:01 -04:00
Joey Hess
fa763214e3
close bugs for just fixed tag creation issue
2008-09-25 20:27:35 -04:00
Joey Hess
965f7310fe
git: Fix handling of utf-8 filenames in recentchanges.
...
Seems that the problem is that once the \nnn coming from git is converted
to a single character, decode_utf8 decides that this is a standalone
character, and not part of a multibyte utf-8 sequence, and so does nothing.
I tried playing with the utf-8 flag, but that didn't work. Instead, use
decode("utf8"), which doesn't have the same qualms, and successfully
decodes the octets into a utf-8 character.
Rant:
Think for a minute about fact that any and every program that parses git-log,
or git-show, etc output to figure out what files were in a commit needs to
contain this snippet of code, to convert from git-log's wacky output to a
regular character set:
if ($file =~ m/^"(.*)"$/) {
($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
}
(And it's only that "simple" if you don't care about filenames with
embedded \n or \t or other control characters.)
Does that strike anyone else as putting the parsing and conversion in the
wrong place (ie, in gitweb, ikiwiki, etc, etc)? Doesn't anyone who actually
uses git with utf-8 filenames get a bit pissed off at seeing \xxx\xxx
instead of the utf-8 in git-commit and other output?
2008-09-25 18:26:42 -04:00
Joey Hess
dfe55e8956
Add keepextension parameter to htmlize hook. (Willu)
2008-09-23 13:39:21 -04:00
Joey Hess
9cbcda14ac
Print a debug message if a page has multiple source files.
2008-09-23 13:32:41 -04:00
Joey Hess
7280d84c1c
merged
2008-09-23 12:47:36 -04:00
http://ptecza.myopenid.com/
338f0fde60
* Response
2008-09-23 08:34:43 -04:00
chrysn
88beb46def
bug report on funny characters in the name
2008-09-23 04:58:35 -04:00
http://smcv.pseudorandom.co.uk/
ba1b9f8562
bug report with patch
2008-09-22 18:36:26 -04:00
http://smcv.pseudorandom.co.uk/
b44ca17f93
2008-09-22 18:29:48 -04:00
http://smcv.pseudorandom.co.uk/
c4fde75f46
Reference patches to beautify redirection URLs
2008-09-22 18:28:39 -04:00
http://www.cse.unsw.edu.au/~willu/
2f3b93a55a
Add second, related, patch.
2008-09-21 06:04:37 -04:00
http://www.cse.unsw.edu.au/~willu/
57682e72d9
Add patch
2008-09-21 04:30:28 -04:00
http://www.cse.unsw.edu.au/~willu/
e255e8ecbf
Add a new bug when using source highlighting
2008-09-21 00:49:11 -04:00
Joey Hess
779c5214f3
progress: Display an error if the progress cannot be parsed, and allow the percent parameter to only optionally end with "%".
2008-09-19 13:09:50 -04:00
http://ptecza.myopenid.com/
b203b58f48
* Addition
2008-09-19 10:13:55 -04:00
http://ptecza.myopenid.com/
f5b0ea73b5
* Response
2008-09-19 09:48:56 -04:00
http://www.cse.unsw.edu.au/~willu/
68531e1239
Response
2008-09-19 08:28:38 -04:00
http://ptecza.myopenid.com/
72b8c09843
* More clear about my upgrade
2008-09-19 06:00:29 -04:00
http://ptecza.myopenid.com/
538168d869
* No progress
2008-09-19 05:43:10 -04:00
Joey Hess
fa4f735ad7
response
2008-09-17 13:49:03 -04:00
http://thewordnerd.info/
65120e433d
2008-09-16 08:19:41 -04:00
http://josephturian.blogspot.com/
17af48adca
2008-09-15 23:07:19 -04:00
http://josephturian.blogspot.com/
0254bbb5e8
2008-09-15 23:06:04 -04:00
Joey Hess
293c69ae95
user error
2008-09-15 17:38:25 -04:00
Joey Hess
c8f1fe835e
fix links
2008-09-14 17:03:34 -04:00
Joey Hess
1e4c9e6733
cannot reproduce
2008-09-14 13:43:27 -04:00
http://madduck.net/
c984a572c8
new bug about parsing recentchanges diffs
2008-09-13 08:29:55 -04:00
Joey Hess
97b71834bb
fix IkiWiki::Setup::load docs
2008-09-12 21:20:34 -04:00
bremner
ec6cd6fff8
more difficulties with IkiWiki::Setup::load
2008-09-12 21:09:50 -04:00
http://thewordnerd.myopenid.com/
25629d7621
2008-09-11 20:26:56 -04:00
Joey Hess
9152042aea
fix cpan links
2008-09-11 19:40:41 -04:00
jpritikin
d02411bac0
2008-09-11 07:13:45 -04:00
Joey Hess
20ad20a87b
response
2008-09-10 16:47:19 -04:00
jpritikin
62df83b57c
2008-09-10 12:53:29 -04:00
Joey Hess
7a680431ed
Add allow_symlinks_before_srcdir to config so websetup doesn't eat it.
2008-09-09 14:50:37 -04:00
jpritikin
848d0d0a3b
2008-09-09 14:27:47 -04:00
Joey Hess
2b53de66a0
ddate: Stop clobbering timeformat when not enabled.
2008-09-08 19:40:23 -04:00
http://smcv.pseudorandom.co.uk/
f50622f136
amusing collision between ddate and websetup
2008-09-08 18:31:35 -04:00
Joey Hess
d2679de965
For fine control over what characters are allowed, unescaped in source filenames, the wiki_file_chars setting is added. For example, set to "-[:alnum:]+/._" to disable colons from being used in source files (which can cause trouble om Windows).
2008-09-04 14:13:10 -04:00
Joey Hess
000c87f510
don't fail if %config is not set
2008-09-01 11:26:03 -04:00
bremner
da30f5a8fb
workaround
2008-08-31 17:58:42 -04:00
bremner
f7ad016a3f
report trouble trying to use IkiWiki::Setup::load outside ikiwiki
2008-08-31 15:47:01 -04:00
Joey Hess
75a096d056
Work around perl $_ scoping nonsense that caused breakage when loading external plugins.
2008-08-29 18:40:41 -04:00
chrysn
a8d9f1c5cd
report bug for </methodResponse> problem (patch included)
2008-08-29 17:43:28 -04:00
Joey Hess
981d0474a1
Ignore failure to install files into /etc, in case install is running as non-root.
2008-08-29 15:53:46 -04:00
Joey Hess
ef3d080a9a
response
2008-08-29 15:49:52 -04:00
bremner
114db37eb3
patch for install in $HOME
2008-08-29 14:30:38 -04:00
Joey Hess
4d0b142412
response
2008-08-29 13:29:10 -04:00
http://www.cse.unsw.edu.au/~willu/
df641322ed
comments
2008-08-29 02:01:04 -04:00
Joey Hess
6efbbf967e
response
2008-08-28 16:41:56 -04:00
Joey Hess
0e45a7c776
fix a few direcives
2008-08-26 17:56:23 -04:00
Joey Hess
b2d7bbb922
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
...
Conflicts:
doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
2008-08-25 20:51:45 -04:00
Joey Hess
d06096ad0d
edittemplate: Don't wipe out edits on preview.
2008-08-25 20:51:10 -04:00
JoeRayhawk
b8c8201876
Signing
2008-08-25 20:29:39 -04:00
JoeRayhawk
3c542cc279
Bug: previewing with an edittemplate reverts edit box
2008-08-25 20:27:00 -04:00
Joey Hess
b278218d91
response
2008-08-25 19:31:57 -04:00
Joey Hess
d6fd1f1cc8
rename preprocessordirective to directive
...
Reasons include:
- easier to type
- might want postprocessor directives again sometime, and listdirectives
can then use the directive/* files for either
- that it's done as a preprocessor step is an internal detail (and not a
very accurate one, really :-)
2008-08-25 14:19:39 -04:00
Joey Hess
14885af458
cannot reproduce
2008-08-23 15:45:44 -04:00
http://mskala.livejournal.com/
56c2fca4b0
2008-08-23 14:28:01 -04:00
Joey Hess
9b10f5eab2
map: The fix for #449285 was buggy and broke display of parents in certian circumstances.
...
The use of $dummy was not sufficient, because it only stuck around for the
first element after a dummy parent, and was then lost. Instead, use a
$addparent that contains the actual dummy parent, so it can be compared
with the new item to see if we're still under that parent or have moved to
another one.
2008-08-23 13:10:49 -04:00
Joey Hess
7071d0b586
remove incorrect comment
2008-08-23 12:19:39 -04:00
Joey Hess
bc0e09e6c8
problem with the patch
2008-08-23 12:13:38 -04:00
Joey Hess
dec9b4e2c9
Avoid using cp -a (again). (HenrikBrixAndersen)
2008-08-21 16:21:40 -04:00
https://brian.may.myopenid.com/
2ad40b82f4
add more details
2008-08-21 02:39:31 -04:00
http://thewordnerd.myopenid.com/
5f7050ed33
2008-08-20 22:20:34 -04:00
http://josephturian.blogspot.com/
0257186f4d
2008-08-18 20:53:59 -04:00
HenrikBrixAndersen
bebfceda30
Add suggestion
2008-08-18 17:22:34 -04:00
http://josephturian.blogspot.com/
9d9a9076d9
2008-08-18 16:37:31 -04:00
http://josephturian.blogspot.com/
c790e3975e
2008-08-18 12:10:10 -04:00
HenrikBrixAndersen
6f70b29506
Add proposed patch
2008-08-16 09:09:47 -04:00
JoshTriplett
b31809a577
2008-08-15 19:50:39 -04:00
http://jcflack.myopenid.com/
79a3fbb1ab
2008-08-14 16:08:53 -04:00
Joey Hess
d875fbb52e
response
2008-08-14 14:50:02 -04:00
Joey Hess
5d83e7359d
graphviz: Fix breakage of the name of the preprocessor directive.
2008-08-14 14:44:30 -04:00
HenrikBrixAndersen
15424d405b
Add wish about not using 'cp -a'
2008-08-13 15:28:33 -04:00
HenrikBrixAndersen
e43c3ebece
Add graphviz bug
2008-08-13 15:22:09 -04:00
Joey Hess
2aa46a3a8e
response
2008-08-12 18:38:49 -04:00
http://edward.myopenid.com/
0e9deb3a41
create bug report
2008-08-12 17:49:41 -04:00
http://www.cse.unsw.edu.au/~willu/
9c33352e9b
Mark done
2008-08-07 17:18:14 -04:00
Joey Hess
581381e335
inline: Ignore parent dirs when sorting pages by title.
2008-08-07 15:47:59 -04:00
http://www.cse.unsw.edu.au/~willu/
de836d6141
2008-08-07 07:45:05 -04:00
http://www.cse.unsw.edu.au/~willu/
0455bd68b5
2008-08-07 07:43:53 -04:00
http://www.cse.unsw.edu.au/~willu/
9f90278d41
2008-08-07 07:42:47 -04:00
http://www.cse.unsw.edu.au/~willu/
8c355286dc
Add patch to bug report
2008-08-07 04:14:53 -04:00
http://www.cse.unsw.edu.au/~willu/
db1ed357fb
Note that inline sort by title really sorts by path
2008-08-07 03:43:59 -04:00
http://www.cse.unsw.edu.au/~willu/
78cf903610
Add note on work-around
2008-08-05 07:06:16 -04:00
http://www.cse.unsw.edu.au/~willu/
ea7bcf6472
Clarify when 'above' and 'below' mean higher and lower on the page, and when they mean printing over the top of other items
2008-08-05 06:54:08 -04:00
http://www.cse.unsw.edu.au/~willu/
921b28dde3
More information making sidebar and recentchanges work together
2008-08-05 06:46:09 -04:00
http://www.cse.unsw.edu.au/~willu/
4f58ad1c10
Add screenshots
2008-08-05 00:49:22 -04:00
Joey Hess
d1cb73cb55
set background color of floating divs
...
If a floating div is next to (and in front of) a div that takes up the
whole screen width, and has a background color set, that color can bleed
through into the floating div. One exampe of this is inline's blogpost
form. Avoid it by setting the background color of the floating element.
2008-08-04 15:08:27 -04:00
Joey Hess
86674c9584
done
2008-08-04 14:56:47 -04:00
http://smcv.pseudorandom.co.uk/
eadff687ab
2008-08-03 11:24:20 -04:00
http://www.cse.unsw.edu.au/~willu/
4cdf41df0c
small patch update
2008-08-02 22:20:53 -04:00
http://www.cse.unsw.edu.au/~willu/
35a3559ebe
Add patch to bug report
2008-08-02 22:14:26 -04:00
http://www.cse.unsw.edu.au/~willu/
6c2163d596
update to actual generated example
2008-08-02 21:52:48 -04:00
http://www.cse.unsw.edu.au/~willu/
b7d7abf2b4
Sidebar layout strange
2008-08-02 19:53:08 -04:00
http://smcv.pseudorandom.co.uk/
200fb31d04
Suggest how to solve this
2008-08-02 09:48:32 -04:00
Joey Hess
bc1c267723
response
2008-08-01 17:39:17 -04:00
http://jcflack.myopenid.com/
19d8acaa95
2008-08-01 10:55:46 -04:00
Joey Hess
041923a89e
Merge branch 'master' into autoconfig
...
Conflicts:
IkiWiki/Plugin/git.pm
debian/changelog
po/ikiwiki.pot
2008-07-31 19:35:37 -04:00
Joey Hess
71eb56bcac
merged
2008-07-31 18:52:30 -04:00