Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 9 Oct 2012 14:50:37 +0000 (10:50 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 9 Oct 2012 14:50:37 +0000 (10:50 -0400)
commit4c1582c11eb85bf356c943abf1b31dde3453e73d
treed72bdd146078c1902d9ff6b966a7ae98d49edb83
parentdad49323e80889e70ce3fc1bf479ede89a5f1607
parent9b3a8e93c327a6c45be97ebe34ac1669e09c82c5
Merge branch 'master' of ssh://git.ikiwiki.info