Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/flex-blazeds
Conflicts:
modules/testsuite/src/test/java/flex/messaging/util/TestServer.java
Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/9c858843
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/9c858843
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/9c858843
Branch: refs/heads/master
Commit: 9c8588434055d0a0fca6a239e646cb22b8704b1e
Parents: 1cf3381 45a58ab
Author: Christofer Dutz <christofer.d...@codecentric.de>
Authored: Wed Aug 6 11:27:46 2014 +0200
Committer: Christofer Dutz <christofer.d...@codecentric.de>
Committed: Wed Aug 6 11:27:46 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
