Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 6 Jun 2013 08:58:22 +0000 (10:58 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 6 Jun 2013 08:58:22 +0000 (10:58 +0200)
commit86fa8e6b1add1648012fcc656c0eaee9187ab364
tree4289af274154f7a7debc9aca66a23000292858b5
parent3bf629e8baaf61d89db9832efd95fb5db903e542
parent9999b250e11d96017488a25f6dfa6d3385d83e9c
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next