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 11:46:56 +0000 (12:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 Jan 2014 11:46:56 +0000 (12:46 +0100)
commit68e89a2f2828084bbe7a8fa15a16ae9626d4c74e
treeb48e378cb61075b9e0e98fd6deb9787c1901532e
parent8c252e6aa83f0a45d248dc59ae2bbc2ca717b229
parent0f9894afa1e2c534f671c87efac4a1ec9997d637
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
html/html/themes/ipfire/include/css/style.css