merge from trunk
commit7cb2f8b52926d37347e5a412abd7a004707258a6
authorJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 15:16:25 +0000 (13 17:16 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 13 Aug 2013 15:16:25 +0000 (13 17:16 +0200)
tree5cbd59c8cc90806a82ba504fae3ea10e9079ea11
parent2da59f810184f36b4061eb422011de057bd0588e
parent53b64418c20b6288e0e3a589b61db47861a575b6
merge from trunk