]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge tag '3.20120202' into trail3-integrated
authorSimon McVittie <smcv@debian.org>
Sun, 18 Mar 2012 15:31:41 +0000 (15:31 +0000)
committerSimon McVittie <smcv@debian.org>
Sun, 18 Mar 2012 15:31:41 +0000 (15:31 +0000)

Trivial merge