Merge pull request #500 from rother/master
authorAaron1011 <aa1ronham@gmail.com>
Tue, 28 Oct 2014 18:46:02 +0000 (14:46 -0400)
committerAaron1011 <aa1ronham@gmail.com>
Tue, 28 Oct 2014 18:46:02 +0000 (14:46 -0400)
Update api.rst


Trivial merge