Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 Jan 2014 12:08:27 +0000 (13:08 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 Jan 2014 12:08:27 +0000 (13:08 +0100)
commit30491c6ac70ce55d4bfbcec5aee6096808b3c193
treeb9d35f526decaa955089d658a84ca6bb8fc1ab81
parent68e89a2f2828084bbe7a8fa15a16ae9626d4c74e
parentb5890e73693cb323b115cf5245964177cb902f64
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

Conflicts:
html/html/themes/ipfire/include/css/style.css
html/html/themes/ipfire/include/css/style.css