Rebase to cliffordwolf repo HEAD finished.
authorSiesh1oo <siesh1oo@siesh1oo.no>
Tue, 11 Mar 2014 18:44:34 +0000 (19:44 +0100)
committerSiesh1oo <siesh1oo@siesh1oo.no>
Tue, 11 Mar 2014 20:59:20 +0000 (21:59 +0100)

Trivial merge