Squashed commit of the following:
authorEvan Prodromou <evan@status.net>
Mon, 13 Aug 2012 18:33:19 +0000 (14:33 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 13 Aug 2012 18:34:31 +0000 (14:34 -0400)
commit9b97adc7adf3deb6ac977a286191455f22ce2c6d
tree6d216346a2b4d23ecc46eda17c7a590a9281efed
parent330041e8bfd91f0b9ba3f11a957a6b1be93c631e
Squashed commit of the following:

commit 2b9bce9ef8f6cf55b7ac62231bcc0173260ba472
Merge: 3ba4f24 12b680e
Author: Evan Prodromou <evan@status.net>
Date:   Mon Aug 13 14:31:46 2012 -0400

    Merge commit 'refs/merge-requests/207' of git://gitorious.org/statusnet/mainline into merge-requests/207

commit 12b680e375db9de01cac77dd9a71adb729292dc7
Author: Mikael Nordfeldth <mmn@hethane.se>
Date:   Fri Aug 10 20:49:52 2012 +0200

    testing whether $user is predefined before otherwise setting it to common_current_user()
lib/util.php