Commit c3b6607508d565ddccd9afaef12ae18e6a176837

Kano 2014-01-25T13:46:50

Merge remote-tracking branch 'conman/master'