Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into groff
authorMatthias Fischer <fischerm@ipfire.org>
Sun, 1 Feb 2015 16:22:09 +0000 (17:22 +0100)
committerMatthias Fischer <fischerm@ipfire.org>
Sun, 1 Feb 2015 16:22:09 +0000 (17:22 +0100)
commite0f8464866f71590e7f5c9a43a59a60e633a6c8f
treea253eccf25562fef9a164985e362e90cbeded598
parenta44790b647b40130187fdaff4cec710bbaad7ed9
parent06f451c0beaba72872fa7ab81a043eb92a3f63ee
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into groff