Merge branch 'master' of git.esoui.com:eso-SousChef-15

Author katkat42 <johannsn@blindbox.com>
Author date 2014-06-23 20:15:53
Author local date 2014-06-23 15:15:53 -0500
Committer katkat42 <johannsn@blindbox.com>
Committer date 2014-06-23 20:15:53
Committer local date 2014-06-23 15:15:53 -0500
Commit 74926de23d400e0ff7963d1bbf5a85fabe2d6841
Tree 3916c3bc64415a4d140fb1fdeaabe77f7b254001
Parent 11b1ed26acc36d20f5e0968464d8a3098a256cc0
Parent 05959b12750cb6db51f77fdc066d2e240f80368d
Merge branch 'master' of git.esoui.com:eso-SousChef-15

Conflicts:
	SousChef.lua