]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'origin/master'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:27:17 +0000 (01:27 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:27:17 +0000 (01:27 +0100)

Trivial merge