]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 21:27:50 +0000 (17:27 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 21:27:50 +0000 (17:27 -0400)
commit18d24036477223794e8319428cd7ba971129c29c
tree23995024e878a6c0df4e1572571948af89d435e2
parent97e21ae21caa2418015ae512755e8078a0bc5ccf
parentc2ffd205f3301a9fe6b5949a88da770899642589
Merge branch 'master' into tova

Conflicts:

debian/changelog
debian/changelog