ebmor via svn r9782:
JiKun: set 10N/10H flockC=15 back to "Upper" ("Lower" looked like a mistype); infinite LFR minutes
Omega via svn r9783:
Add in basic Flex stat support. Obviously incomplete until 5.4 ptr but just to get some placeholder code in.
Improve pull timer by using newannounce instead of addmsg so it actually displays in center of screen and plays sound like people are used to old raid warnings doing.
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline

Conflicts:
	DBM-ThroneofThunder/JiKun.lua