Merge remote branch 'smcv/ready/sort-package'
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Apr 2010 03:15:33 +0000 (23:15 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Apr 2010 03:15:33 +0000 (23:15 -0400)
commitbab8fec52468b780485bdf96a37a593bd033c7e3
tree5f292e4e6205bd4fcde1be249c1fe646dc75a26c
parent9dc220711dff12fd45274c4e2fd2645a33d3de5c
parenta2dc8c9373b36f7cc8da239b823b5839788a743d
Merge remote branch 'smcv/ready/sort-package'

Conflicts:
debian/NEWS
IkiWiki.pm
debian/NEWS
doc/plugins/write.mdwn