Merge branch 'master' of git://git.ikiwiki.info into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Wed, 25 Jan 2012 05:41:53 +0000 (00:41 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Wed, 25 Jan 2012 05:41:53 +0000 (00:41 -0500)
commitc9c5264191f2e4134766f084e6f83affed2d4d12
tree7f50889f82a61a7a9217efdf3cd55838590b9d3a
parent678c240eff91c059291585ad56e6353f522677c7
parentbfda13f16c3a055b30d7e5448dd6640a12898adc
Merge branch 'master' of git://git.ikiwiki.info into cvs