Remove branch alias for 1.1.x
Collection::ensureIndex() should convert write options (fixes #168)
Merge pull request #172 from doctrine/1.0.x-ensureindex-wc

Collection::ensureIndex() should convert write options (fixes #168)
Merge branch '1.0.x' into 1.1.x

Conflicts:
	lib/Doctrine/MongoDB/Collection.php