Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Sat, 20 Jun 2015 21:08:05 +0000 (23:08 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Sat, 20 Jun 2015 21:08:05 +0000 (23:08 +0200)
commit9cc5fe54aeb906a8183baf42aa34a414c73acc76
treee9604a78488789ee84299b9e4597b8c803020cde
parent25ed6b82c7d6e2ee799a4b69da046e4185333b35
parent1f02b6e0e15f06284d865247a06457acbb98c1a0
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next