Release release_20141006
authorClinton Ebadi <clinton@unknownlamer.org>
Mon, 6 Oct 2014 04:13:45 +0000 (00:13 -0400)
committerClinton Ebadi <clinton@unknownlamer.org>
Mon, 6 Oct 2014 04:13:45 +0000 (00:13 -0400)

Trivial merge