merge master
commit5693f3de69f9db99252b2f4eb1c7178fdec2a210
authorJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 11:52:42 +0000 (22 12:52 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 11:52:42 +0000 (22 12:52 +0100)
tree55d1a29fd499799220ac79735aa4c54bd82ff24b
parent5c1d2b0f06ddb1f6b520b2446ce9e207e5bfc315
parentd7995b18e4c7b6ac7b5e31c3c8f5f5db648d3275
merge master