]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of github.com:schmonz/ikiwiki
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 01:56:22 +0000 (19:56 -0600)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 01:56:22 +0000 (19:56 -0600)
commitbb6e77562e2f4eaec44ae952c590a27ae37c736c
tree06b4166b04bab4cc1240abe434aa26c33f1fc253
parentbfda13f16c3a055b30d7e5448dd6640a12898adc
parent662d256c821d85d041a7620aa0bac6144ff95af4
Merge branch 'master' of github.com:schmonz/ikiwiki