]> git.ipfire.org Git - ipfire-2.x.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Dec 2014 17:01:21 +0000 (18:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Dec 2014 17:01:21 +0000 (18:01 +0100)
commit7fae88972f04acde0f011ebc1dbfbed35e522536
treebd2867306da0716dd30cd7643f3da34f2c8a77b7
parent66c684fa60c4ad2a6333d4bb41196c636c4748de
parent7168162ef13be445996ff2f65d12e5643ef0f2b2
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x