Joey Hess 17b2afe721 Merge branch 'master' into next ... Conflicts: debian/changelog po/ikiwiki.pot		2008-12-28 15:12:11 -05:00
..
.gitignore	…
Makefile	…
bg.po	typo	2008-12-26 21:45:12 -05:00
cs.po	typo	2008-12-26 21:45:12 -05:00
da.po	typo	2008-12-26 21:45:12 -05:00
de.po	typo	2008-12-26 21:45:12 -05:00
es.po	typo	2008-12-26 21:45:12 -05:00
fr.po	typo	2008-12-26 21:45:12 -05:00
gu.po	typo	2008-12-26 21:45:12 -05:00
ikiwiki.pot	Merge branch 'master' into next	2008-12-28 15:12:11 -05:00
pl.po	typo	2008-12-26 21:45:12 -05:00
sv.po	typo	2008-12-26 21:45:12 -05:00
vi.po	typo	2008-12-26 21:45:12 -05:00