Merge branch 'master' into po
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 27 Mar 2009 19:09:41 +0000 (15:09 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 27 Mar 2009 19:09:41 +0000 (15:09 -0400)
commit825e2b1378b1def4980e36642ed84999599eb017
tree8c5225715c9cf7a3405dbc679f124f74ca9983e7
parentf4a1732b0e65ea4459098e4e852dff10a5af9320
parentc8237b4351f6023b3d3a661df2568c6d7488b8cf
Merge branch 'master' into po

Conflicts:
debian/control
IkiWiki.pm
debian/control