resolve conflicts
authorsalimfadhley <sal@stodge.org>
Fri, 11 Oct 2013 22:31:13 +0000 (23:31 +0100)
committersalimfadhley <sal@stodge.org>
Fri, 11 Oct 2013 22:31:13 +0000 (23:31 +0100)
commitc816c2535ed2173408d34eac7fe6dc38b497db18
treed4657e74d2d62b26ca723796a8cff2c4083ef317
parent5159618309d44dcd0d64e65ed99c5749baf618f6
parentf93777094abd6926c1f683bd5d4664aa348cfa8b
resolve conflicts
jenkinsapi/job.py
jenkinsapi/utils/requester.py