[greasemonkey-dev] [greasemonkey/greasemonkey] a42949: Merge remote branch 'sizzlemctwizzle/issue-1111'

Branch: refs/heads/third-party
Home:   http://github.com/greasemonkey/greasemonkey

Commit: a429498d688bf32e9c838db3951c069169c9aee7
    
http://github.com/greasemonkey/greasemonkey/commit/a429498d688bf32e9c838db3951c069169c9aee7
Author: Anthony Lieuallen <[EMAIL PROTECTED]>
Date:   2010-06-14 (Mon, 14 Jun 2010)

Changed paths:
  M content/addons.js
  M content/addons.xul
  A content/third-party/mpl-utils.js
  M locale/en-US/gm-addons.dtd

Log Message:
-----------
Merge remote branch 'sizzlemctwizzle/issue-1111'

Conflicts:
        content/addons.js
        locale/en-US/gm-manage.properties


-- 
You received this message because you are subscribed to the Google Groups 
"greasemonkey-dev" group.
To post to this group, send email to [EMAIL PROTECTED]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/greasemonkey-dev?hl=en.