Fri May 24 22:28:23 CEST 2013 - Need to rethink the callback handling
Merge remote branches 'origin' and 'origin/master'