]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 18 Apr 2012 19:48:10 +0000 (15:48 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 18 Apr 2012 19:48:10 +0000 (15:48 -0400)
commit760df1da8297c6cff557d42c8b25bcfb86065425
treeb17ef66eb7dfc40295122ef675798c41ee101e7f
parent7f0d58fce37d0136068917bacbf77e8cdb4358d8
parenta822a5865b7ab74f12fe4b44edc68e728f71c293
Merge branch 'master' of ssh://git.ikiwiki.info