]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge remote-tracking branch 'origin/master'
authorSimon McVittie <smcv@debian.org>
Wed, 26 Nov 2014 11:33:23 +0000 (11:33 +0000)
committerSimon McVittie <smcv@debian.org>
Wed, 26 Nov 2014 11:33:23 +0000 (11:33 +0000)
commit690cc823aeb234fb0ef4cf099302ad78fdd364f1
treed01a131bb1d51f61823b433ef94687760228f72f
parent1abf35e1b5223de4c3da142eda6bf8b036272b34
parent2eb96a54dfdd1fb9878a9e874aba065275e99f95
Merge remote-tracking branch 'origin/master'