bitmask_client.git/changes, 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
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












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.







Merge remote-tracking branch 'ivan-github/bug/3857_username-case-problem' into develop
2013-09-19T20:00:07+00:00

Kali Kaneko
kali@leap.se

2013-09-19T20:00:07+00:00

3d6371adb2bf1abd3d09e9f1ff047cc3421d3733












Merge remote-tracking branch 'ivan-github/bug/3656_generic-username-password-message' into develop
2013-09-19T19:51:41+00:00

Kali Kaneko
kali@leap.se

2013-09-19T19:51:41+00:00

e9fa473865c84deb20ebf550f9cdc34c253a8cc2












Merge remote-tracking branch 'ivan-github/feature/standalone-flag-to-module' into develop
2013-09-19T19:50:43+00:00

Kali Kaneko
kali@leap.se

2013-09-19T19:50:43+00:00

1c194fe4b5d7b43097c31331cc8a7162bfbef4be












Username case problem at login. Closes #3857.
2013-09-19T16:00:11+00:00

Ivan Alejandro
ivanalejandro0@gmail.com

2013-09-19T15:55:32+00:00

de766834e4a0148d7ca8ededaf84194dc7a5fb44