Merge branch 'master' into unstable
authorSalim Fadhley <sal@stodge.org>
Tue, 13 Jan 2015 22:06:09 +0000 (22:06 +0000)
committerSalim Fadhley <sal@stodge.org>
Tue, 13 Jan 2015 22:06:09 +0000 (22:06 +0000)
commitd02c2cee5ce31ad35cfd3943ab260a1995b1f6bd
tree1451bb638fda3269720c3f0cbae30dabefc438d2
parentab92e943be109a8f9f3f3bf149be849498ffd57f
parentc15651ddb02a2fa4f6620e3c0bde204a93fe34b9
Merge branch 'master' into unstable

Conflicts:
jenkinsapi/job.py
jenkinsapi/job.py
jenkinsapi/queue.py
jenkinsapi_tests/unittests/test_build.py