Reverse merge of Master to capture Travis CI configuration
authorjordanmccullough <jordan@github.com>
Mon, 30 Sep 2013 19:35:23 +0000 (13:35 -0600)
committerjordanmccullough <jordan@github.com>
Mon, 30 Sep 2013 19:35:23 +0000 (13:35 -0600)
commit4269277cd0b52e41936ad358d43329f9aba36a2c
treece46fc647ae595e8c2351b206c83f8eebab15a53
parent33569bcac1112de44024b9561d0d5f58595d2903
parent786c5c7990fcb30d4247962e06d73b3aeeb0fe37
Reverse merge of Master to capture Travis CI configuration