merge from trunk
commit3c9c017cab31011b22218785d48b2bf9e95ef618
authorJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 07:11:51 +0000 (13 09:11 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 13 Sep 2013 07:11:51 +0000 (13 09:11 +0200)
tree3122478cfe18fb10d103ce871d86697128b09fb5
parentb501019048b1f8986132843a7a629036abce8e98
parent2ada368ae92ff7b39e3beef407351fdfd31ae87b
merge from trunk