merge from trunk
commitfb14d1d90742d51047a2c51b57a87e976a106aa6
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 07:45:18 +0000 (11 09:45 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 07:45:18 +0000 (11 09:45 +0200)
tree89d1c352aebac455e371322e1d4627dc4562953a
parent6481f6dd5203af347dca2ff2cf599be8e79fb1b9
parent53482f41157f37a7f6afb7f19be8fc63b015f6ed
merge from trunk