Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 10:02:42 +0000 (12:02 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 10:02:42 +0000 (12:02 +0200)
commitdd13db416633e3fb4242c7ff39d235799cd28910
tree81b4feda231daee6cc3eb15802bb735aa29fdef5
parenteeef5fa660454d9e838ea6e4db4395a2940bc2f4
parentee299e2ecf6e9fbc6dbf7fdc18c5a8980e122b12
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next