Merge remote-tracking branch 'origin/master'
Conflicts:
client-samples/GetAPIVersion.php
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fdf34dc5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fdf34dc5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fdf34dc5
Branch: refs/heads/master
Commit: fdf34dc5f71cdb686cd634ef5960616169008cfd
Parents: 2c6cced 126ee28
Author: Suresh Marru <[email protected]>
Authored: Thu May 22 14:33:32 2014 -0400
Committer: Suresh Marru <[email protected]>
Committed: Thu May 22 14:33:32 2014 -0400
----------------------------------------------------------------------
client-samples/GetAPIVersion.php | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
