Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 23 Aug 2011 17:09:35 +0000 (13:09 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 23 Aug 2011 17:09:35 +0000 (13:09 -0400)
commit26d9a24fde920429add603b9d893787c41903477
tree714c5669079f892e3bff1444878372e716c85731
parent35bc56bb664e77f24806895dc2060047f5b08d4c
parent25bdb236d5623a85757831a5a6ce6af419602ed7
Merge branch 'master' of ssh://git.ikiwiki.info