From: Zach Copley Date: Thu, 18 Mar 2010 22:28:21 +0000 (-0700) Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=109aac3c49041e9323f74d9a9660186de069176d;p=quix0rs-gnu-social.git Merge branch 'testing' of gitorious.org:statusnet/mainline into testing * 'testing' of gitorious.org:statusnet/mainline: Fix for xmpp/sms notification options appearing to be disabled on new subscriptions. --- 109aac3c49041e9323f74d9a9660186de069176d