Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 8 Oct 2013 13:51:41 +0000 (09:51 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 8 Oct 2013 13:51:41 +0000 (09:51 -0400)
commit65b8fba17c444864135f5f19aeb42d928ca0b120
tree9a587353deeb0c914135ad355344d0879c898313
parent470a1e0f41b98955bc5ea7a410d8ee1ee08e4056
parentbb561efbce39d7df02bb1236fd94762c25fa6734
Merge branch 'master' of ssh://git.ikiwiki.info