Merge commit '3127f5'

Author Sasky <sky42ks@gmail.com>
Author date 2014-06-21 12:43:17
Author local date 2014-06-21 05:43:17 -0700
Committer Sasky <sky42ks@gmail.com>
Committer date 2014-06-21 12:43:17
Committer local date 2014-06-21 05:43:17 -0700
Commit 0470e88fc99042b7e4dbc099a1e470a85a7c1576
Tree 9950b0d492effc48d1385827e12bd07006fe09ac
Parent 19690e89d102c721c35fd34311e885ae21357eb0
Parent 3127f53367a5c538320e6378f45fe04588074c0d
Merge commit '3127f5'

Conflicts:
	LAddMin.lua
	LAddMin.txt

Straight merge - still 2 menu generation functions