Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 5 Aug 2011 20:37:57 +0000 (16:37 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 5 Aug 2011 20:37:57 +0000 (16:37 -0400)
commitbe556863cbb7f3f2553bfd9a2b3fdf90ed4882c2
tree79323568a87a426ed5aa05152d5b47f5dea0f0e3
parent0760db7368044c0c7aad79e97a87f3af4d9c7d6e
parentb697e551c5fd941ae1108695ff3b25b558676925
Merge branch 'master' of ssh://git.ikiwiki.info