Commit 44faaa54c6cb3b3bf001a93a1ffd575cb30f0351

Kano 2012-08-23T12:39:36

Merge remote-tracking branch 'conman/master'