]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'origin/master'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Fri, 28 Aug 2009 14:55:28 +0000 (15:55 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Fri, 28 Aug 2009 14:55:28 +0000 (15:55 +0100)
commita3f4077c3667898ec39acbd6e25c04e82e98c0b2
treee5d3542cf4f6165996850e8281cbb1a339d87e75
parentde4dc8befe7ede3cd34daf3f2bce5dd6305599f0
parent6be874612539d3148d288fc6a4c47743a7c0c8fc
Merge commit 'origin/master'