Merge branch 'master' of git://git.ikiwiki.info into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 24 Jan 2012 07:40:43 +0000 (02:40 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 24 Jan 2012 07:40:43 +0000 (02:40 -0500)
commit873c404f144c37adb1c9121b35dc372d5934ebbf
tree7f50889f82a61a7a9217efdf3cd55838590b9d3a
parenta64b224f524bcef95fc3befeb3e66a854f9e3bff
parentbfda13f16c3a055b30d7e5448dd6640a12898adc
Merge branch 'master' of git://git.ikiwiki.info into cvs