11/09/2014 10:50
Merge remote-tracking branch 'origin/clipit_2.0' into clipit_2.0