merge from trunk
commitde9a6574cc346bf3d8fb90e46cd4d62a42249817
authorJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 14:07:59 +0000 (25 16:07 +0200)
committerJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 14:07:59 +0000 (25 16:07 +0200)
tree8d9b733ffe64976d2dab7b9c5c8078b5769e055a
parent37f54c5079d36bae4ee4f133c45d349bab564c48
parent869455d4321f936935fd74753d0fa2c17ec7870e
merge from trunk