merge from trunk
commitffb49902dad1e9f8ae8083732c395e4103ba0561
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 15:57:23 +0000 (26 17:57 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 15:57:23 +0000 (26 17:57 +0200)
tree33c7e7959297537914228e2ec8eb9d5ecbeac801
parent339d3a117c08bdb7399ceb856ad6c793e9f01b53
parentefec3894b2c9ace7de0545d5bb20685cd4140253
merge from trunk