merge edge into master
authorArthur Wolf <wolf.arthur@gmail.com>
Wed, 27 Mar 2013 17:00:41 +0000 (18:00 +0100)
committerArthur Wolf <wolf.arthur@gmail.com>
Wed, 27 Mar 2013 17:00:41 +0000 (18:00 +0100)

Trivial merge