git://git.onelab.eu / plcapi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 31d3ced ade748b)
Merge 5.3 branch, as that becomes the new master, and 5.1 becomes the legacy branch
authorgggeek <giunta.gaetano@gmail.com>
Tue, 9 Dec 2014 23:33:47 +0000 (23:33 +0000)
committergggeek <giunta.gaetano@gmail.com>
Tue, 9 Dec 2014 23:33:47 +0000 (23:33 +0000)
commit172e482d9aa27d7866d7a38fea8be90182480b79
tree08e97de76fd190777ac55c82b09520ec9679f001tree | snapshot
parent31d3cedaafa355e5682d55a3d7178b53aedfbaa0commit | diff
parentade748bccdd7c80272315b923b5572866edb4e30commit | diff
Merge 5.3 branch, as that becomes the new master, and 5.1 becomes the legacy branch

Conflicts:
ChangeLog
Makefile
demo/client/comment.php
demo/client/introspect.php
demo/client/which.php
doc/xmlrpc_php.xml
lib/xmlrpc.inc
lib/xmlrpc_wrappers.inc
test/benchmark.php
test/parse_args.php
13 files changed:
ChangeLog diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
debugger/controller.php diff1 | diff2 | blob | history
demo/client/client.php diff1 | diff2 | blob | history
demo/client/comment.php diff1 | diff2 | blob | history
demo/client/introspect.php diff1 | diff2 | blob | history
demo/client/mail.php diff1 | diff2 | blob | history
demo/client/which.php diff1 | diff2 | blob | history
demo/client/wrap.php diff1 | diff2 | blob | history
demo/client/zopetest.php diff1 | diff2 | blob | history
doc/xmlrpc_php.xml diff1 | diff2 | blob | history
test/benchmark.php diff1 | diff2 | blob | history
test/testsuite.php diff1 | diff2 | blob | history
plcapi