testing.git, branch feature/buildbot-test

testing git hooks please disregard

2013-01-23T17:27:48+00:00

testing git hooks please disregard

2013-01-23T17:22:44+00:00

tick

2013-01-23T17:12:04+00:00

tick

2013-01-23T17:07:05+00:00

tick

2013-01-23T17:06:18+00:00

tick

2013-01-23T17:05:43+00:00

working up/down resolv-conf script

2013-01-22T22:02:58+00:00

Merge branch 'develop' of ssh://leap.se/leap_client into develop

2013-01-22T15:31:14+00:00

Merge branch 'feature/soledad-api' into develop

2013-01-22T12:09:43+00:00

Conflicts:
	src/leap/soledad/__init__.py
	src/leap/soledad/backends/couch.py
	src/leap/soledad/backends/leap_backend.py
	src/leap/soledad/backends/objectstore.py
	src/leap/soledad/tests/test_couch.py
	src/leap/soledad/tests/test_logs.py
	src/leap/soledad/tests/test_sqlcipher.py
	src/leap/soledad/util.py

Cleanup tests.

2013-01-22T11:51:38+00:00