soledad.git, branch 0.4.2 [soledad] Merge branch 'release-0.4.2' 2013-11-01T13:39:22+00:00 Tomás Touceda chiiph@leap.se 2013-11-01T13:39:22+00:00 7dc16ac9286f0383c158e6028a028d99c5b1f373 






Fold in changes
2013-11-01T13:38:45+00:00

Tomás Touceda
chiiph@leap.se

2013-11-01T13:38:45+00:00

ee02ab5518d621014903ce6ae512a969ad4a4ccd












Merge remote-tracking branch 'kali/fix-path-error' into develop
2013-10-31T23:05:00+00:00

Tomás Touceda
chiiph@leap.se

2013-10-31T23:05:00+00:00

cb4675e639b2c9111031ab1773eba39526c9da1a












change error severity
2013-10-31T22:52:59+00:00

Kali Kaneko
kali@leap.se

2013-10-31T22:52:59+00:00

3d9ca03131d6801980126de0224001859ca1351b












Merge remote-tracking branch 'drebs/bug/fix-dict-representation-for-python-2.6' into develop
2013-10-31T16:10:37+00:00

Tomás Touceda
chiiph@leap.se

2013-10-31T16:10:37+00:00

216d0a43de4d2f6b93470a9a5a94c17c118380c0












Fix dict representation so it works on python 2.6.
2013-10-31T15:41:02+00:00

drebs
drebs@leap.se

2013-10-31T15:41:02+00:00

5914f47d4f1f3cad1429b11ddce467e7cc65aedb












Merge remote-tracking branch 'kali/add-freeze-debianver' into develop
2013-10-30T13:58:40+00:00

Tomás Touceda
chiiph@leap.se

2013-10-30T13:58:40+00:00

e9e3cd7531d97a67ca4d08f102abe8fdb2585790












add freeze_debianver command
2013-10-30T13:51:16+00:00

Kali Kaneko
kali@leap.se

2013-10-30T13:49:37+00:00

6f61d5987ad8d3ac62f49f257817e6a9b4540703












Merge remote-tracking branch 'ivan-github/bug/4330_soledad-bootstrapping-problem' into develop
2013-10-30T13:28:44+00:00

Kali Kaneko
kali@leap.se

2013-10-30T13:28:44+00:00

115c7a4e638bdd930844ab9efee2521784e5e7ad












Passphrase is already an unicode object.
2013-10-29T17:56:03+00:00

Ivan Alejandro
ivanalejandro0@gmail.com

2013-10-29T17:56:03+00:00

8b61202b82a09ec8994c38383d3a14fb378eaf55

As we enforce to have the passphrase as an unicode object, we no longer
need this conversion.

[Related to bug #4330]





As we enforce to have the passphrase as an unicode object, we no longer
need this conversion.

[Related to bug #4330]