Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Jul 2015 10:25:43 +0000 (12:25 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Jul 2015 10:25:43 +0000 (12:25 +0200)
commit66289de753c1ca1c2196b1246fcab46ec7735ba4
tree00ce0f9e9734553acbc5b65df1152b6b75107bbd
parent5d4bb3c9ffbff5e4d3d7ee7094a1dd296c44ca41
parenta722eae9dd0067eead8898fa2a53c95469e10226
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next