Merge branch 'master' into po
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 19 Jul 2009 10:36:01 +0000 (12:36 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 19 Jul 2009 10:36:01 +0000 (12:36 +0200)
commitec965fc92cd41f597c6e8e88584b9a688407c8c6
tree410173c14f66ae62a6436ea00b73bb470c9d1dda
parent86edd73d169600875a10a635ef8df4a644545b0d
parentfa2c3a3dba2a4589b63cf445ec9e33ec19be627e
Merge branch 'master' into po

Conflicts:
debian/changelog
IkiWiki.pm
debian/changelog