merge from trunk
commit37f54c5079d36bae4ee4f133c45d349bab564c48
authorJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 10:27:13 +0000 (25 12:27 +0200)
committerJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 10:27:13 +0000 (25 12:27 +0200)
tree44d51d5aa187fa7b97fdfc7a3e984119eb924d0c
parentb8e2acdd013a259b64c97292d229d78e9da2e3cd
parentb5eb9035266f58e99695fd424cba84f994db9a0e
merge from trunk