Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Fri, 24 Apr 2015 22:32:20 +0000 (00:32 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Fri, 24 Apr 2015 22:32:20 +0000 (00:32 +0200)
commitc8ab87f16b30bbc86d6beedb73e512f8ec4d7d1b
treeca6130b5d219bc6f66853f962d272238c6c66509
parent7a2b5c6470e8b723868de7a5c994404d0b75d4fb
parent0594323b79a4bf8ba390a4cd9a2c6833983174ac
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next