Conflicts: .gitmodules
@@ -1,3 +1,3 @@
[submodule "libblkmaker"]
path = libblkmaker
- url = git://gitorious.org/bitcoin/libblkmaker.git
+ url = git://github.com/bitcoin/libblkmaker.git