Merge branch 'master' of git.esoui.com:eso-AddonClearer-45

Author katkat42 <johannsn@blindbox.com>
Author date 2014-08-03 17:22:51
Author local date 2014-08-03 12:22:51 -0500
Committer katkat42 <johannsn@blindbox.com>
Committer date 2014-08-03 17:22:51
Committer local date 2014-08-03 12:22:51 -0500
Commit 5b5917bc9a063dc4f63d561856e9eada2bf37e9b
Tree 5723e959cfec6f0f347811ceb1444a576e40a08e
Parent 581a17d443eabc094b8f10322a0d0b4841c67ac7
Parent caf9d64d867f375e91a1015ee002b604979bf97a
Merge branch 'master' of git.esoui.com:eso-AddonClearer-45

Conflicts:
	AddonClearer.txt