summaryrefslogtreecommitdiffstats
path: root/VERSION
diff options
context:
space:
mode:
authorYaroslav Brustinov <ybrustin@cisco.com>2015-10-26 10:05:17 +0200
committerYaroslav Brustinov <ybrustin@cisco.com>2015-10-26 10:05:17 +0200
commit81f9f7ee4476edeacf4996e16e78d9bea87967ae (patch)
tree289212d60dfad029c51bb484819f703f55202967 /VERSION
parent2f15c0d6ea149dc3c4e226779908d8dc6755e1e8 (diff)
parent4290a0982d510a40e0bb789279c1acd4d2530d6f (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions