merge from trunk
commit4cf8510dd6d33a59b4b6b9d18a9108fdb4cc6884
authorJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 17:22:29 +0000 (23 19:22 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 17:22:29 +0000 (23 19:22 +0200)
treecc64fc99caf075ba06ac201efd2866c87ed28239
parentf211300506e978ca56553398cc0e20976cb91247
parentcb8d2612434ccdd7524a0da9c4728720c9badab3
merge from trunk