commit @ Sat Sep 27 20:15:21 EDT 2014
Merge remote-tracking branch 'origin/master'