kevgliss b8720566d7 fixing merge conflict

2015-08-09 16:52:14 -07:00

..

index.rst

fixing merge conflict

2015-08-09 16:52:14 -07:00