]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into templatemove
authorJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:47:54 +0000 (00:47 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:47:54 +0000 (00:47 -0400)
commit39d4bfde6b9c49f0a8b13699be701bda11eb851a
tree22e157d84ff8fdfa564279a69d9d543f2f8e0866
parent8a56df576a9d7d184a5233bcde8ea07eee86dd60
parentb28323e76a98d56fa4af813338a134dea0106626
Merge branch 'master' into templatemove