Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 23 Jan 2013 23:53:02 +0000 (10:53 +1100)
committerJoey Hess <joey@kitenet.net>
Wed, 23 Jan 2013 23:53:02 +0000 (10:53 +1100)
commitea21db6b71f02ebf9b7105452326142f1e1b84b0
treeb0ff1dc1d73462a02de2b70c42e3871200d43df4
parente5d82ef8680dce98b3afab43605d7b278c98c789
parent590527a1026c515796d77ac73cd6cbd5d4cf277f
Merge branch 'master' of ssh://git.ikiwiki.info