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)
commit7525fe0696f2833ee456ed9e3e6747ba7f9af648
tree6dde67e4ad8aecd2c3a2314610402c5d4b3c8ead
parentaf5a0eba3375e5f6f731eb98cf628100ffdce5bf
parent14318b0e488e252d619046f96a3eb2b58d68db04
Merging master to add-more-test to fix travis

This will make travis tests work on this branch as well.