summaryrefslogtreecommitdiff
path: root/lib/settingsaction.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-02-16 13:15:09 -0500
committerCraig Andrews <candrews@integralblue.com>2010-02-16 13:15:09 -0500
commit20d6a7caed6636c28cc7b95c584549691dff4388 (patch)
treebcf44f5f31a38ff08b363ab45ab486ace9ff1a99 /lib/settingsaction.php
parent32084e33a266797b306158df29e48f057651b410 (diff)
parentd5cbfe8071d56438cfa168dc3db56a959317eae0 (diff)
Merge branch '0.9.x' into 1.0.x
Conflicts: lib/queuemanager.php lib/xmppmanager.php plugins/Xmpp/Fake_XMPP.php scripts/imdaemon.php
Diffstat (limited to 'lib/settingsaction.php')
0 files changed, 0 insertions, 0 deletions