ankidroid/Anki-Android — pull request #140 by flerda (2013-12-13 22:43:25+00:00)
Title: Catch up v2.1-dev to v2.0.2-dev

Taking all commits from 2.0.2 and merging them into 2.1.