kevgliss d0d3e06c81 fixing merge conflicts

2015-08-09 16:51:25 -07:00

..

index.rst

fixing merge conflicts

2015-08-09 16:51:25 -07:00