Merge branch 'master' into 0.7

This commit is contained in:
Ross Lawley 2012-09-27 08:30:36 +00:00
commit 2645e43da1

View File

@ -469,7 +469,7 @@ If a dictionary is passed then the following options are available:
Whether the index should be sparse.
:attr:`unique` (Default: False)
Whether the index should be sparse.
Whether the index should be unique.
.. note ::