Merge pull request #272 from bjoernh/master
authortexane <texane@gmail.com>
Tue, 14 Oct 2014 19:07:42 +0000 (14:07 -0500)
committertexane <texane@gmail.com>
Tue, 14 Oct 2014 19:07:42 +0000 (14:07 -0500)
add support for OS X 10.10 Yosemite


Trivial merge