merge from trunk
commit93797975c60e1f1503f998be728ccbdbe1e86ab3
authorJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 13:37:08 +0000 (26 15:37 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 26 Aug 2013 13:37:08 +0000 (26 15:37 +0200)
tree355e4797fb836ebf44ae7bef5cd2575582e44471
parent22fee396d08f331f962d793203a5cbf1cb003836
parent78fc2530af6b5b36351542b5662ba5d9d5813d04
merge from trunk