Merge remote-tracking branch 'ms/fifteen-theme' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Jan 2014 20:16:17 +0000 (21:16 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Jan 2014 20:16:17 +0000 (21:16 +0100)
commit9027a25d92afbbb4486c17deac66b4c439e80520
treeb112d91892353e708133e70d5f1c1a7c4df00280
parent4234ca5d64f8e34c40ee48c58599f00cb3a15862
parent935f311ed9dc4c67d7e603f6b08a45d1225422c8
Merge remote-tracking branch 'ms/fifteen-theme' into fifteen