Merge devel to 2.5.x #121

Merged
merged 3 commits into from Feb 28, 2014
Commits on Feb 24, 2014
  1. @okiss @sgilda

    JDF-640 Updated functional tests

    okiss committed with sgilda Feb 21, 2014
  2. @sgilda

    Revert "JDF-640 Updated functional tests"

    sgilda committed Feb 24, 2014
    This reverts commit d6f2d6c.
Commits on Feb 28, 2014
  1. @sgilda