merge from trunk
commitbdc620822ad19cf60b99ef20f255c0a61aa16119
authorJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 19:56:43 +0000 (25 21:56 +0200)
committerJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 19:56:43 +0000 (25 21:56 +0200)
tree9266df8eac3a297bb4da9e25cc60c0f6010a5601
parentde9a6574cc346bf3d8fb90e46cd4d62a42249817
parent67aeda8d2fbe438c2e2308f6d770ff3646a3e37d
merge from trunk