Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 4 Mar 2013 22:32:40 +0000 (18:32 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 4 Mar 2013 22:32:40 +0000 (18:32 -0400)
commita417262d58c1b8240357e6e0a203e1f32c39205d
treeed026ae0d196ecbbf1f32b034d81dba6be17a6e8
parent00d23a23ebf0b54f775bd37c545cde4db1ae048a
parentaf9798fb29841b54e49b64ae4e1bcc1bf119b5f0
Merge branch 'master' of ssh://git.ikiwiki.info