Merge branch 'ping' of /var/www/mublog.corrupt into corrupt/ping

Conflicts:

	lib/util.php

diff --cc lib/common.php
Simple merge

diff --cc lib/util.php
index 167508d2b30bd64de540ac19d7d33c0e2d692583,419e21e828ca0700ab398e8e0b0d458b10ef8154..9637dc5063aa541b9f065a66a00f7d4d9822e366
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -852,7 -1124,7 +852,7 @@@ function common_broadcast_notice($notic
  
  function common_enqueue_notice($notice)
  {
-     foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook') as $transport) {
 -    foreach (array('jabber', 'omb', 'sms', 'public', 'ping') as $transport) {
++    foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook', 'ping') as $transport) {
          $qi = new Queue_item();
          $qi->notice_id = $notice->id;
          $qi->transport = $transport;