25/04/2014 14:06
Merge branch 'master' of C:\Users\equipo\Documents\Clipit master with conflicts.
Merge branch 'master' of C:\Users\equipo\Documents\Clipit master with conflicts.
Merge remote-tracking branch 'origin/master'
25/04/2014 14:06