Merge branch 'master' into my_changes
authorThomas Spalinger <spali@github.com>
Tue, 25 Jun 2013 20:53:14 +0000 (22:53 +0200)
committerThomas Spalinger <spali@github.com>
Tue, 25 Jun 2013 20:53:14 +0000 (22:53 +0200)

Trivial merge