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)
commit3d530781b0fde032a35751bb18bf99d9b9f0db17
treef4d7ace2a4e6c029265198211d079abce981c942
parentdd5b4e01d75b74772e86fc846b1695693b11e7c2
parent11feede0e016174c767a038b82ebc117ea0ab260
merge edge into master