merge master
commit54efd2ab176dd6cc33bb1e86a9c37908c26d0a46
authorJoakim Verona <joakim@verona.se>
Sun, 18 Jan 2015 09:53:38 +0000 (18 10:53 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 18 Jan 2015 09:53:38 +0000 (18 10:53 +0100)
treeae7dfc525e25275235b1d6de84cf067a751742e4
parent576960211cb54bc77dc6969591420bca89c59456
parent253d44bd27b7d90b614b6b968a3b125eeb0a48f2
merge master