Merge branch 'Garkin' into promise

Author Sasky <sky42ks@gmail.com>
Author date 2014-06-21 13:18:40
Author local date 2014-06-21 06:18:40 -0700
Committer Sasky <sky42ks@gmail.com>
Committer date 2014-06-21 13:18:40
Committer local date 2014-06-21 06:18:40 -0700
Commit c4e7e3e05690d3443fe0dd6c9a7a8378ae356ee0
Tree 36a23350b5ba92c20e547cfd3783fc664b3e5f6d
Parent 25aaf7e097dfd722944d981c60bd404e2b34d045
Parent b3fe00314048d741af2973c2be2396fca213bc94
Merge branch 'Garkin' into promise

Conflicts:
	LAddMin.lua