Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Nov 2014 22:52:28 +0000 (23:52 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Nov 2014 22:52:28 +0000 (23:52 +0100)
commit07686bd7e27e790af69f6c3ad7c5f24298ab4c21
tree6a61d5afc4f292985e3ee9b930eab34854798470
parentbfb421f1bb70ab1a2fbd0839a7d1fc37a472ed45
parentdc3de45125581d78a5aaa8055b6516fc4a152c79
Merge remote-tracking branch 'origin/seventeen' into seventeen