diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-02-02 17:00:10 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-02-02 17:00:10 -0500 |
| commit | 057ec1fceacbfec1f755a5bc6700a188aa70e33f (patch) | |
| tree | 297839a71d9d3a7a0a7935d5dbcc9c4a3c6c99bb /scripts/stopdaemons.sh | |
| parent | d14651706cf728f116b7ae44c6a6e37b5eb918a4 (diff) | |
| parent | f60f2c523f2e7018ea923898931287e7a99e8f44 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
EVENTS.txt
lib/imqueuehandler.php
lib/jabber.php
lib/util.php
plugins/Xmpp/Sharing_XMPP.php
Diffstat (limited to 'scripts/stopdaemons.sh')
0 files changed, 0 insertions, 0 deletions