merge from trunk
commit202cca22fe9e2451a8d3cabe0c443ba985289503
authorJoakim Verona <joakim@verona.se>
Sat, 24 Aug 2013 02:36:40 +0000 (24 04:36 +0200)
committerJoakim Verona <joakim@verona.se>
Sat, 24 Aug 2013 02:36:40 +0000 (24 04:36 +0200)
treee81f63d5a3a578ef23839b43b071854d015613a8
parent4bd3d0459af0b4c8ec3128d0d0d67ff2cbc2750d
parent9c05bccfb9cd29ab66b5c46643467671315a0f29
merge from trunk