Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 Nov 2014 16:36:01 +0000 (17:36 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 Nov 2014 16:36:01 +0000 (17:36 +0100)
commitb1c1a589944c88d24cfbc20387d607419e2fb61c
tree8b5620788b1e7dd29d4679b11f4497132caa55e9
parentbb75bc3b140749a736040d767ff89d25177ae330
parent817317ed9e961e39a2a3b643e15426b9da5b83a3
Merge remote-tracking branch 'origin/seventeen' into seventeen