merge from trunk
commitf1a3b0d491f830e1fe5ce29aad325ec9dd4ebde1
authorJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 07:22:12 +0000 (13 09:22 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 07:22:12 +0000 (13 09:22 +0200)
treea2342ae0a5893ce95b9df636a0a596611d7bfd2f
parent3c9c017cab31011b22218785d48b2bf9e95ef618
parent96fd6ea2144e30cfb7aae3a3267e349b2e64bc1b
merge from trunk