summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorGaurav Sinha <gaurav.sinha@vyatta.com>2011-11-09 16:38:23 -0800
committerGaurav Sinha <gaurav.sinha@vyatta.com>2011-11-09 16:38:23 -0800
commit68cd41c6547d6e511d55c0046bc88c1598cecf54 (patch)
tree7140cf820a53dff192cb85570252a0b8ecd19e27 /etc
parente81cb347e56e9b3cec8faa119aacbc0ef7ce9cef (diff)
parentf6c2586a9d552abc977a5c7a148fd21b070d04a8 (diff)
downloadvyatta-op-68cd41c6547d6e511d55c0046bc88c1598cecf54.tar.gz
vyatta-op-68cd41c6547d6e511d55c0046bc88c1598cecf54.zip
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-op into oxnard
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions