Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 6 Jul 2010 17:57:28 +0000 (13:57 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 6 Jul 2010 17:57:28 +0000 (13:57 -0400)
commit7639474244083ec934edc801eb57010162eccf5e
tree84bd678d73ea609fd78321dcfebc1625b70474be
parent2dd0c177a6b33488dfcfff9041a3749b44484f34
parent9edab06b186e7e0b3d7cef84e92509cdb05ddb7d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info