Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into BUG10730
authorAlexander Marx <alexander.marx@ipfire.org>
Tue, 3 Feb 2015 06:27:03 +0000 (07:27 +0100)
committerAlexander Marx <alexander.marx@ipfire.org>
Tue, 3 Feb 2015 06:27:03 +0000 (07:27 +0100)
commit2c9c92f4651fccdb18daa4da8adef5d1d4d9a716
tree0347b172031da17cc6b6442c92f074b1e33b03ba
parent8516edcc485a986f8be6b4483f7993456a5e75af
parentdb2e0a5baecda01fe22a7bb17010dcb1a73b372b
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into BUG10730