Fixed incorrect merge
authorAleksey Maksimov <ctpeko3a@gmail.com>
Sat, 12 Apr 2014 14:00:21 +0000 (22:00 +0800)
committerAleksey Maksimov <ctpeko3a@gmail.com>
Sat, 12 Apr 2014 14:00:21 +0000 (22:00 +0800)
commitc95441ad4de8536fa55613bce7467be914b3f5a7
treeb98f7087405d6b4fa7a43454e9dc21f992ac1ae1
parent61573357e6571cdd5478243d094e76cc6062f299
Fixed incorrect merge
jenkinsapi/fingerprint.py