Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 28 Dec 2008 20:12:11 +0000 (15:12 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 28 Dec 2008 20:12:11 +0000 (15:12 -0500)
Conflicts:

debian/changelog
po/ikiwiki.pot

1  2 
debian/changelog
po/ikiwiki.pot

Simple merge
diff --cc po/ikiwiki.pot
Simple merge