]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 01:56:51 +0000 (19:56 -0600)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 01:56:51 +0000 (19:56 -0600)
commit8e752d09766da8b3ebb9ca9ba6f67be7168e63d1
tree1858451087b52a8c3fad036e053cfd704d8feb8f
parent51d0aa406d40aa8dede624736f64f2ed055360b9
parent111db0b6be5b8fc5881e1e383d5360b768f68845
Merge branch 'master' into cvs