Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Apr 2015 09:26:35 +0000 (11:26 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Apr 2015 09:26:35 +0000 (11:26 +0200)
commit6caea1086d15a0f6d797da31a67d132a298c5d14
treed718d9174c404f595b2ba293d9ff2be59c837a4a
parent85a6f39c39385d3867a95b037adfd601718735c5
parent0e2f9b011b8945dbfdfd3cac9fe1a486c48732e1
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next