Merge branch 'master' into groups

diff --cc js/util.js
index 4aad8413409ab1c6d9e10733be0e412a8138319b,d98b63dd790bf44480b7ee9ef2f94f7aeb8a64b0..bb68c25879dc4f82b121c032cae9ed12914b4c77
--- 1/js/util.js
--- 2/js/util.js
+++ b/js/util.js
@@@ -151,11 -129,12 +151,11 @@@ $(document).ready(function()
                                                                                           }
                                          };
  
-       $("form.subscribe").ajaxForm(Subscribe);
-       $("form.unsubscribe").ajaxForm(UnSubscribe);
-       $("form.subscribe").each(addAjaxHidden);
-       $("form.unsubscribe").each(addAjaxHidden);
+       $(".form_user_subscribe").ajaxForm(Subscribe);
+       $(".form_user_unsubscribe").ajaxForm(UnSubscribe);
+       $(".form_user_subscribe").each(addAjaxHidden);
+       $(".form_user_unsubscribe").each(addAjaxHidden);
  
 -
        var PostNotice = { dataType: 'xml',
                                           beforeSubmit: function(formData, jqForm, options) { if ($("#notice_data-text").get(0).value.length == 0) {
                                                                                                                                                                $("#form_notice").addClass("warning");

diff --cc lib/util.php
Simple merge