summaryrefslogtreecommitdiffstats
path: root/VERSION
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2016-02-18 16:59:34 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2016-02-18 16:59:34 +0200
commit50f1673887f711cbeb470b040b08ec3f65c91763 (patch)
tree50866a15f9c7d4962e30c1230dca2334378d019f /VERSION
parentac8d0a812f152de146fc7455e057da31f84c2c83 (diff)
parent77531f879979de5c261802c88b41a361a18095ab (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions