Merging master to add-more-test to fix travis
authorChris Glass <tribaal@gmail.com>
Wed, 25 Jun 2014 09:25:10 +0000 (11:25 +0200)
committerChris Glass <tribaal@gmail.com>
Wed, 25 Jun 2014 09:25:10 +0000 (11:25 +0200)
This will make travis tests work on this branch as well.


Trivial merge