diff options
| author | P. Christeas <p_christ@hol.gr> | 2010-12-28 13:35:27 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2010-12-28 13:35:27 +0200 |
| commit | 6eb0e8e8aa965d33a25d9c226b9389f3deccbea1 (patch) | |
| tree | 9641cd04c9feb79b7a7beefc3f832610b8463602 /addons/base_setup/__init__.py | |
| parent | 774983d16d3afe3b4e22ce0f3cde3c34c66b7dec (diff) | |
| parent | 0e7f74342a2defe12594866f17f2b7a7cecf884a (diff) | |
Merge remote branch 'rebzr/vmt-base-crypt' into tmp-base-crypt
Conflicts:
base_crypt/crypt.py
bzr revid: p_christ@hol.gr-20101228113527-phhl69vkj7dudvx3
Diffstat (limited to 'addons/base_setup/__init__.py')
0 files changed, 0 insertions, 0 deletions