Merge commit 'refs/merge-requests/6' of gitorious.org:bitcoin/eloipool
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 15 Mar 2014 06:25:50 +0000 (06:25 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 15 Mar 2014 06:25:50 +0000 (06:25 +0000)
commit09630150b301933ee1f2d50d7ba5171348f751a6
tree0f64bca3e2f58d8509311d51d520bd3d8d81a44e
parent8e8a24998dba0fb183d4bc657e6b64ba29217d39
parent4495b6db8e0c390f08685763de04c872ee79703c
Merge commit 'refs/merge-requests/6' of gitorious.org:bitcoin/eloipool