------------------------------------------------------------------------
r49 | slaren | 2011-06-29 14:56:29 +0000 (Wed, 29 Jun 2011) | 1 line
Changed paths:
   M /trunk
   M /trunk/Announce.lua
   M /trunk/Data.lua
   M /trunk/DataCapture.lua
   M /trunk/DeathNote.lua
   M /trunk/DeathNote.toc
   M /trunk/Format.lua
   A /trunk/Locales.lua (from /branches/wow4.2/Locales.lua:48)
   M /trunk/Options.lua
   M /trunk/Output.lua
   M /trunk/UI.lua

- Merging 4.2 branch
------------------------------------------------------------------------
