Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Nov 2013 10:41:18 +0000 (11:41 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Nov 2013 10:41:18 +0000 (11:41 +0100)
commit1187d46e65e9938fab90fb463a8c3ee15e4a646a
tree0d34c8308382a8a6c54bfdee01d7370986070fb9
parent9659f59a86ebe76e860370cb7480198ea4323e71
parent6f0fd5e1789e59ec1aad25bea560494c5750a4b9
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen