Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Sep 2013 08:40:24 +0000 (10:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Sep 2013 08:40:24 +0000 (10:40 +0200)
commit318685daf4a9d404a98b24f2175e505525547b31
tree4f80603c18d4cd16f477afcc0b41615d152cb2ad
parent99093fa51667deb09c2ca4dd9cbad1d3469d738a
parentc4979a81c8d27fed69b4f360cc67845bac85549a
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen