Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 8 Jan 2014 22:02:07 +0000 (23:02 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 8 Jan 2014 22:02:07 +0000 (23:02 +0100)
commit9b574b13de88735968287db83bf1936087f9e59a
tree6e5eb7da4b243771e3c637adecd85daa404233e4
parent0008a2d7566f88d83aa75cdd8c2f35909475a69c
parent33c56b4f5853524a2c8dabc4d36ff602d6bf6314
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen