2.1.1 fixed conflict issue and changed version

git-svn-id: https://plugins.svn.wordpress.org/wp-database-backup/trunk@969483 b8457f37-d9ea-0310-8a92-e5e31aec5664