Merge branch '1.0' into 2.0

Sylvain Lebresne · Sylvain Lebresne · commit e4453ae99584 · 2014-02-28T08:56:11.000+01:00
Conflicts:
	README.rst
	driver-core/README.rst
	driver-core/pom.xml
	driver-examples/pom.xml
	driver-examples/stress/pom.xml
	pom.xml
diff --git a/README.rst b/README.rst
@@ -62,7 +62,6 @@ to fix a number of inconsistencies and remove cruft.
 Unfortunately this means there are some breaking changes, but the new API should be both simpler and more complete.
 
 
-
 Troubleshooting
 ~~~~~~~~~~~~~~~
 
diff --git a/driver-core/README.rst b/driver-core/README.rst
@@ -67,7 +67,6 @@ it in your application using the following Maven dependency::
 Upgrading from 1.x branch
 -------------------------
 
-
 If you are upgrading from the 1.x branch of the driver, be sure to have a look at
 the `upgrade guide <https://github.com/datastax/java-driver/blob/2.0/driver-core/Upgrade_guide_to_2.0.rst>`_.
 
