git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cbe242 40fd689)
Merge remote branch 'origin/0.6.2' into 0.6.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 15 May 2012 07:23:32 +0000 (07:23 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 15 May 2012 07:23:32 +0000 (07:23 +0000)
Conflicts:
src/addrman.cpp


Trivial merge
Novacoin client