Merge commit 'refs/merge-requests/7' of gitorious.org:bitcoin/eloipool
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 15 Mar 2014 15:07:51 +0000 (15:07 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 15 Mar 2014 15:07:51 +0000 (15:07 +0000)
commit691a11dcc01c629d5040d65b47144b98322966e6
tree43a3c0fc4ed480ca411c2e67f79fd63807b8d1ea
parent09630150b301933ee1f2d50d7ba5171348f751a6
parent2e23638535c63852efe3594e15484ac23a8361d3
Merge commit 'refs/merge-requests/7' of gitorious.org:bitcoin/eloipool