diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-07-08 14:57:36 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-07-08 14:57:36 -0300 |
commit | d136315bb987b7624c2fb6883635f8c5f2512270 (patch) | |
tree | dd50706df83e2210f0aea677b24deaa5ea40bebd /.tx | |
parent | 7cba5ebdb8fa4b6c53e7f7d08cfcb9a032e7ac5b (diff) | |
parent | c9c126b67f1a13483075aae680b30813117fbb05 (diff) |
Merge remote-tracking branch 'kali/bug/wizard-hangs' into develop
Diffstat (limited to '.tx')
0 files changed, 0 insertions, 0 deletions