]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge remote-tracking branch 'origin/master'
authorJoey Hess <joeyh@joeyh.name>
Thu, 28 Apr 2016 23:06:01 +0000 (19:06 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 28 Apr 2016 23:06:01 +0000 (19:06 -0400)
commit95c0a63675036b0f8bed7fd7a0d8485d4f605578
tree77fb58c796eb4de7fa4954a067f496655ed803df
parentd165ebccd3a7b0dbb1770656cf51140fa0d2971b
parent81852a7db7a56e1f2d27afb3f17a09a847aa8b03
Merge remote-tracking branch 'origin/master'