diff options
| author | JCTutorius <charlie@tutorius-dev.(none)> | 2009-11-05 18:42:53 (GMT) |
|---|---|---|
| committer | JCTutorius <charlie@tutorius-dev.(none)> | 2009-11-05 18:42:53 (GMT) |
| commit | 80c7d20f83d15890a31b5e0a584dfcb24fb3f2a6 (patch) | |
| tree | 086460d4240ea4c6ab93df4d8e9b1ae9178fb182 /tutorius/viewer.py | |
| parent | 29338d21201d35d815719d5efadde70411bdda54 (diff) | |
| parent | 2c28f3a79572c7a57fd00b1c5cc6424fb4fe54fb (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/mainline
Conflicts:
tests/vaulttests.py
tutorius/vault.py
Diffstat (limited to 'tutorius/viewer.py')
0 files changed, 0 insertions, 0 deletions