remove reference to old win32 dev doc
allow 'Studied 1 card in ...' to be translated properly
Merge pull request #5 from Derbeth/master

Translation fix to 'Studied 1 card in...'
Merge branch 'master' of github.com:dae/anki
we must remove cards from learning queue on bury

or they end up with an invalid status when unburied

https://anki.lighthouseapp.com/projects/100923/tickets/484-cant-sync
make sure conf not applied to child filtered decks (#490)
match a single note type in browser even if duplicate names
strip media when searching for duplicates
possible fix for supermemo importer (#480)

Not sure why the original author was converting angle brackets separately -
that code breaks the example provided in #480, but I'm not sure if removing it
will break other files.
catch more unicode errors on import, and improve error msg
make sure we always turn error into unicode (#488)
force rdns for proxy (#331)
add close to browser edit menu (#481)
only open web browser for links on deck description

otherwise clicking on 'more...' will open the web browser
don't fail when importing apkg that references subdirs
include filtered deck name in quotes
add automatic <br> back to field references

{{Front}}
{{Back}}

will now automatically add a <br> to the first field reference, like previous
Anki versions did. The <br> is too complicated for users who just want a plain
template without any HTML.
bump version
fix concat of mid searches
Merge remote-tracking branch 'dae/master' into flake

Conflicts:
	anki/importing/supermemo_xml.py
	anki/sched.py
	anki/stats.py
	aqt/__init__.py
	aqt/deckbrowser.py
	aqt/editor.py
  Merged with meld, set version to 2.0.5 by hand.