merge from trunk
commita8761f8c13d9507250a7d95c687bb3999ca5ac11
authorJoakim Verona <joakim@verona.se>
Sun, 18 Aug 2013 17:52:01 +0000 (18 19:52 +0200)
committerJoakim Verona <joakim@verona.se>
Sun, 18 Aug 2013 17:52:01 +0000 (18 19:52 +0200)
treed562647979a005e803c655db9d16f750d5b1678b
parent9b28ddca0d751a937382f269d274a902528ccfa4
parentf747d82e08b4d1201fa08cfee090759f7a6ef5b1
merge from trunk