Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Sat, 11 Apr 2015 22:09:10 +0000 (00:09 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Sat, 11 Apr 2015 22:09:10 +0000 (00:09 +0200)
commitdbc15d1e62ec7d26c33dea79abb1c5addd9fd9be
tree2857f37777a2656acf588de6fe078235ad9728e1
parente30d382778d09a324665e402bc7d8676c7360bc7
parent040ec360f90d43fbb9fa0fb9bc1f7f52b09eaf77
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next