Update master #6

Merged
merged 1 commit into from Jul 12, 2012
Commits on Jul 12, 2012
  1. @mamluka

    Update master

    mamluka committed Jul 12, 2012