Merge commit 'refs/merge-requests/5' of gitorious.org:bitcoin/eloipool
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 15 Mar 2014 06:23:01 +0000 (06:23 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 15 Mar 2014 06:23:01 +0000 (06:23 +0000)
commit8e8a24998dba0fb183d4bc657e6b64ba29217d39
treef956a15ff822b509a8fcadf9b44bb9a77756d477
parentc62ac23f0d9ca2c2cf8dc8ce5dcfd925edc1f632
parentab6ffaa85745e78442489401139b476fa1555267
Merge commit 'refs/merge-requests/5' of gitorious.org:bitcoin/eloipool