]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge remote-tracking branch 'smcv/ready/trail'
authorJoey Hess <joey@kitenet.net>
Wed, 2 Jan 2013 19:31:10 +0000 (15:31 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 2 Jan 2013 19:31:10 +0000 (15:31 -0400)
commit22cb87c6849dd2baf0c944f1d546f4318e67b325
tree4d4248b8b279add30c768fcca2dc090daa4bda10
parent812a5a136d522107053a15fdb3e518054c44a0e1
parent7029f98bc735efcec08213d51bdec2c6645d682d
Merge remote-tracking branch 'smcv/ready/trail'