merge from trunk
commitf211300506e978ca56553398cc0e20976cb91247
authorJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 15:37:15 +0000 (23 17:37 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 15:37:15 +0000 (23 17:37 +0200)
tree918cec1fe73495df1242b856a394ea90185059d4
parentf909b7cfa7ccac86db11ea8698d01b167a7f37d6
parente3a6636351364fe32463d3a8196e5fc564c66422
merge from trunk