diff options
| author | varac <varacanero@zeromail.org> | 2013-06-27 20:41:34 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-06-27 20:41:34 +0200 |
| commit | 4956480626874c50220404510047edfcde6ece30 (patch) | |
| tree | dd2a3f8fe29a57526e785cd1f754e8769bad144b /add-user-roles | |
| parent | 3c40b36d911004ca0004cf0dd16684a69978ccff (diff) | |
| parent | 21050e4d9055998bd3d2956ab52de97d5dfaebc1 (diff) | |
Merge branch 'master' of ssh://code.leap.se/leap_pistonadmin
Conflicts:
secgroup-adaptation
Diffstat (limited to 'add-user-roles')
0 files changed, 0 insertions, 0 deletions