bitmask_client.git, branch 0.3.3 [bitmask_client] Merge branch 'release-0.3.3' 2013-09-20T20:28:25+00:00 Ivan Alejandro ivanalejandro0@gmail.com 2013-09-20T20:28:25+00:00 1f0f8efc4cb985c082b3b8fe7b3dc45aed047a47 Conflicts: pkg/requirements.pip setup.py src/leap/bitmask/config/leapsettings.py 
Conflicts:
	pkg/requirements.pip
	setup.py
	src/leap/bitmask/config/leapsettings.py
Merge remote-tracking branch 'kali/feature/update-relnotes-to-0.3.3' into release-0.3.3 2013-09-20T20:16:17+00:00 Ivan Alejandro ivanalejandro0@gmail.com 2013-09-20T20:16:17+00:00 222ce2a1513a3776b3277ded365672d7d43ad2e4 






Bump soledad.client version requirement.
2013-09-20T20:14:55+00:00

Ivan Alejandro
ivanalejandro0@gmail.com

2013-09-20T20:14:55+00:00

5a37ab6bb95d227357fe5e832e32a7187e2b6a11












Fold in changes.
2013-09-20T20:13:04+00:00

Ivan Alejandro
ivanalejandro0@gmail.com

2013-09-20T20:11:55+00:00

c8a035c46b0b64772cf630d6c52d738f59ed6e73












Merge remote-tracking branch 'kali/bug/include-resources' into develop
2013-09-20T20:12:52+00:00

Ivan Alejandro
ivanalejandro0@gmail.com

2013-09-20T20:12:52+00:00

99ad43fb8b5676231527398e9809c8c01230ee5a












include resources
2013-09-20T20:13:08+00:00

Kali Kaneko
kali@leap.se

2013-09-20T20:13:08+00:00

c342bd2e9adc5351c4a42b9f6fea027c6969fc16












Merge remote-tracking branch 'kali/feature/eip_state_machine' into develop
2013-09-20T19:59:45+00:00

Ivan Alejandro
ivanalejandro0@gmail.com

2013-09-20T19:59:45+00:00

c628a61319c7c58cc75f018017e453b5ecfdfd27












State Machine Builder and eip connection machine
2013-09-20T20:00:37+00:00

Kali Kaneko
kali@leap.se

2013-09-19T19:49:30+00:00

51948a6d9ee78929b72b0affdbfce36e65e073c2

This implements an abstract definition of a LEAP state machine,
and refactors eip connections to use it.





This implements an abstract definition of a LEAP state machine,
and refactors eip connections to use it.







update relnotes
2013-09-20T19:57:55+00:00

Kali Kaneko
kali@leap.se

2013-09-20T19:44:17+00:00

52ea29a6c225cadc396414ca8f7d662b0633f268












move out vpn management utility
2013-09-20T19:28:26+00:00

Kali Kaneko
kali@leap.se

2013-09-19T21:25:51+00:00

607d34e9d91b3dcbad756814d6710d18328d4a40