]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 9 Jun 2009 01:41:31 +0000 (21:41 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 9 Jun 2009 01:41:31 +0000 (21:41 -0400)
commitf57672f66379c84cd37b9c5a581788aefbb34358
tree35cfef5efc7f4dcdf86d7d5e9e5db3ce8b4c26d6
parentbf55a7fbb1f27ca815ac1e2ee04867686851a134
parent9874a13fbfb9eef2742ae4a9a9d65972e5587db0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:
doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn