Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 8 Jul 2010 18:06:40 +0000 (14:06 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 8 Jul 2010 18:06:40 +0000 (14:06 -0400)
commit3473524e0aae2fcf20527bf1fbed278c01de6dba
tree25cb223a6c8a7315b7aaece8dfb8f69c13314c48
parent7dbad39bbe93ebcc05f278965906fd1c77d2bc34
parent4e9d62a2d75c79f3450781037e24b549dbd3eda6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info