merge from trunk
commit95bca19164fe48c16e5ba04fcf6e6ddd9a22e819
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 18:22:04 +0000 (26 20:22 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 18:22:04 +0000 (26 20:22 +0200)
tree5f61cfdbbd250ed9e74dd6619f0932ebf5f596ba
parentc635a4f3d114db265e574f106710f497b2a450b6
parent1fc8eb33f5534cd3828d7cd15e95771a514dc589
merge from trunk