merge from trunk
commit8e12af0396fe55210371d53c2f8e01783740bad9
authorJoakim Verona <joakim@verona.se>
Sat, 24 Aug 2013 08:57:29 +0000 (24 10:57 +0200)
committerJoakim Verona <joakim@verona.se>
Sat, 24 Aug 2013 08:57:29 +0000 (24 10:57 +0200)
tree781c9e9b85db30e8dcdcdfe42c59e4281c1db65e
parent202cca22fe9e2451a8d3cabe0c443ba985289503
parent6e1b469ee2c44797e9f7922366d069e0f924cc63
merge from trunk