]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge commit 'upstream/master' into pub/po
authorintrigeri <intrigeri@boum.org>
Thu, 21 May 2009 07:15:55 +0000 (09:15 +0200)
committerintrigeri <intrigeri@boum.org>
Thu, 21 May 2009 07:15:55 +0000 (09:15 +0200)
1  2 
debian/changelog

Simple merge