Squashed commit of the following:

bla bla bla bla
commit e16369f15b0a38e5e0f3486f4ec6b9a6e6cb1e77
Author: Daniel Ortega <dortega@twoapart.com>
Date:   Thu Jun 13 18:39:47 2013 +0200

    test

commit 8dc737db2fea912c198393bc3c00ed4928a8c13b
Author: Daniel Ortega <dortega@twoapart.com>
Date:   Thu Jun 13 18:39:26 2013 +0200

    test