upstream/2.7+20120603

Andreas Bombe

@aeb

f0ee1316 · Imported Upstream version 2.7+20120603 · Jun 04, 2012

Upstream version 2.7+20120603