]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sat, 25 Feb 2012 22:15:13 +0000 (17:15 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sat, 25 Feb 2012 22:15:13 +0000 (17:15 -0500)
commitb88994ddfa16a556649479ac95abe9220cdcd40c
tree24147307d83afee601d6fd8f8f4f13154c583c59
parenta42de69fbb3e775dd407d24bf90534a07219710a
parentc9b1291873c55a4c9f2d2271d0c6d6536fb611fe
Merge branch 'master' into cvs