Merge branch 'develop' of github.com:ruby-opencv/ruby-opencv into develop
Merge branch 'master' into develop
fix uncaught exception in CvMat#match_descriptors on OSX Mavericks
Merge branch 'develop' of github.com:ruby-opencv/ruby-opencv into develop
Merge branch 'develop'
bump up version