summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-11 17:35:36 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-11 17:35:36 -0300
commite46ef1d51d2b401bfeafd692e18158f787531459 (patch)
tree9d49c712166157c64f65fdbde795c308862095c4 /Makefile
parent51f19022d304d527faff84bf57edb0dec45216fe (diff)
parentb2653dcf8f9619c73e4fc792a2d952dd2fdfd3b4 (diff)
Merge remote-tracking branch 'ivan/feature/2795_logout-should-not-disconnect-vpn' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions