]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into templatemove
authorJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 20:46:30 +0000 (16:46 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 20:46:30 +0000 (16:46 -0400)
commit4321b301398f6e5e034bfb7b1ab5a996d42ddbb5
tree456a0dcc4f528d57fa4854e4cea904fceb6d2969
parentc2656f08f3a3671b0ba7dc861d53347c7f695ec1
parentcce3042457facddfe5100327dbe98445d9d12b7c
Merge branch 'master' into templatemove