Quantcast

Merge branch 'master' of git.curseforge.net:wow/ouf_lanerra/mainline

Author lanerra <tarkonian@hotmail.com>
Author date 2011-12-28 23:55:17
Author local date 2011-12-28 15:55:17 -0800
Committer lanerra <tarkonian@hotmail.com>
Committer date 2011-12-28 23:55:17
Committer local date 2011-12-28 15:55:17 -0800
Commit 7c0d6c933e4523d23d9217daed65f5fb646e06fb
Tree ecc63d849ea540561fdc7f01966304cd7f356480
Parent 3f26a733f233fe26a946814715d56aea5b0d12c6
Parent e3f8b43d90519d785cf3dc8948ca5a00b1abec41
Merge branch 'master' of git.curseforge.net:wow/ouf_lanerra/mainline

Conflicts:
	oUF_Lanerra.lua
	oUF_Lanerra.toc
	oUF_Lanerra_Config.lua