]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 22 Jan 2012 16:18:07 +0000 (11:18 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 22 Jan 2012 16:18:07 +0000 (11:18 -0500)
commita64b224f524bcef95fc3befeb3e66a854f9e3bff
tree03951a591eebb7313c85f9a967f6a7da75e8bf7b
parentad0e56cdcaaf76bc68d1b5c56e6845307b51c44a
parent662d256c821d85d041a7620aa0bac6144ff95af4
Merge branch 'master' into cvs