Merge remote-tracking branch 'origin/master'

Conflicts:
	devstack/plugin.sh
This commit is contained in:
Dmitriy Ukhlov 2015-10-16 18:05:42 +03:00
commit 1e643aaad7

Diff Content Not Available