Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Tue, 21 Jun 2016 08:08:07 +0000 (10:08 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Tue, 21 Jun 2016 08:08:07 +0000 (10:08 +0200)
commit59232d72251e46011b92501b7538bfe24e869ffa
treeb8237b0100fb436de6e361f9ce9edf7b9e0d0941
parent3a376d999ecf485803c270e3d9d6f767c0378ba9
parent96aeacd808bbde03997e7d699bed16605095c8a8
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next