merge from trunk
commit4db1f22b64c3d19c963b67d9299dc508c440c625
authorJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 07:42:01 +0000 (13 09:42 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 07:42:01 +0000 (13 09:42 +0200)
tree6ea20ea10782f572f419fa4a509596b3a26a6f1d
parent525dcfd1238cb67857cfe816ecb2e7a3c5585c3d
parent1143ebe1e015b36d0b2da74c1418f3f8b693bb09
merge from trunk