summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-30 10:28:52 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-30 10:28:52 -0300
commitdbbf33d27268266088ee1ab15fc04cef33259250 (patch)
treeae3f597a456d1671aa1cdf334912b1422538c93b /pkg
parent0a795cceb0f5902cb928b9b67bd91d0050459238 (diff)
parent7f35ec61513d4286bde08ba957945b38b85ca87a (diff)
Merge remote-tracking branch 'drebs/feature/2683-move-keymanager-to-leap_client' into develop0.2.5release/v0.2.5
Diffstat (limited to 'pkg')
0 files changed, 0 insertions, 0 deletions