Merge remote-tracking branch 'upstream/2.1'

Conflicts:
	README.md
	res/skins/Tango/style.qss
	src/defs_urls.h
	src/defs_version.h

1 files changed, 4 insertions, 0 deletions

diff --git a/README.md b/README.md
index 1184db5137..99dcf98945 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,11 @@ license.
 [mailing list]: https://lists.sourceforge.net/lists/listinfo/mixxx-devel
 [irc channel]: http://mixxx.org/irc.php
 [SCons]: http://www.scons.org/
+<<<<<<< HEAD
 [launchpad 2.2.0]: https://launchpad.net/mixxx/+milestone/2.2.0
+=======
+[launchpad 2.1.1]: https://launchpad.net/mixxx/+milestone/2.1.1
+>>>>>>> upstream/2.1
 [wiki roadmap]: http://mixxx.org/wiki/doku.php/development_roadmap
 [easybugs]: https://bugs.launchpad.net/mixxx/+bugs?field.searchtext=&orderby=-importance&search=Search&field.status%3Alist=NEW&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&assignee_option=any&field.assignee=&field.bug_reporter=&field.bug_commenter=&field.subscriber=&field.structural_subscriber=&field.tag=easy&field.tags_combinator=ANY&field.has_cve.used=&field.omit_dupes.used=&field.omit_dupes=on&field.affects_me.used=&field.has_patch.used=&field.has_branches.used=&field.has_branches=on&field.has_no_branches.used=&field.has_no_branches=on&field.has_blueprints.used=&field.has_blueprints=on&field.has_no_blueprints.used=&field.has_no_blueprints=on
 [creating skins]: http://mixxx.org/wiki/doku.php/creating_skins