Release release_20141006-1
authorClinton Ebadi <clinton@unknownlamer.org>
Tue, 7 Oct 2014 03:21:57 +0000 (23:21 -0400)
committerClinton Ebadi <clinton@unknownlamer.org>
Tue, 7 Oct 2014 03:21:57 +0000 (23:21 -0400)

Trivial merge