Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Fri, 17 Apr 2015 17:41:57 +0000 (19:41 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Fri, 17 Apr 2015 17:41:57 +0000 (19:41 +0200)
commit7a2b5c6470e8b723868de7a5c994404d0b75d4fb
tree46afcb7e09974946f7fbba83c6c0f1318bdf1479
parent8984f4f0c4a416803d9470b284b718ee97fb4352
parent4d9e31ab78dbcf8d6c7cd5720d7cdf410281d778
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next