Merge branch 'development' into clar2 Conflicts: tests-clar/clone/nonetwork.c tests-clar/online/clone.c tests-clar/online/fetchhead.c
2013-01-03T04:24:12