No need to comment out s2s in this branch
s2s
|
Matthew Wild |
Thu, 23 Oct 2008 19:10:16 +0100 |
Backed out changeset 98e9fea75e5b
|
Matthew Wild |
Thu, 23 Oct 2008 18:43:00 +0100 |
Backed out changeset 37b3e9ed8918 (again)
|
Matthew Wild |
Thu, 23 Oct 2008 18:42:25 +0100 |
Backed out changeset a0fc73d5f48c
|
Matthew Wild |
Thu, 23 Oct 2008 18:40:06 +0100 |
Backed out changeset 8f17ba74823c
|
Matthew Wild |
Thu, 23 Oct 2008 18:39:26 +0100 |
Reverting stanza_router to non-conflicted version
|
Matthew Wild |
Thu, 23 Oct 2008 18:33:10 +0100 |
Making the best attempt out of a bad merge from waqas
|
Matthew Wild |
Thu, 23 Oct 2008 18:24:55 +0100 |