merge from trunk
commit5f7470d118360c67a7a2cf3a0aa29280980a6da3
authorJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 20:27:26 +0000 (12 22:27 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 12 Sep 2013 20:27:26 +0000 (12 22:27 +0200)
treec3b44706b967955875aa28c45d6815f81d98934f
parent9a99d023d5c806d71bd645e50251977790f1a134
parent379add74c2635c38ee43f4e649a7d7aa12e03485
merge from trunk