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)
commit64494d286e854f82a91fde92b9960ca81377a69b
tree16f0cb71d778621c59c6c380e03aa25a6699c8ff
parent8effc5a3c51a976024094c5f69c13c05b2dbfd3d
parent0ee0f4d6ccce0ca67052bbf9840df58925291a56
Merge pull request #500 from rother/master

Update api.rst