commit 2a82092b14364845ea60ee210b4d209a974c7960 Merge: 735e90a 3002c1a Author: Sérgio Basto <sergio at serjux.com> Date: Mon May 27 17:01:15 2013 +0100 Merge branch 'master' into f19 ---