Merge remote-tracking branch 'origin/master' into merge-branch

author Kyle Mestery <mestery@mestery.com>

Wed, 1 Jul 2015 21:55:31 +0000 (21:55 +0000)

committer Kyle Mestery <mestery@mestery.com>

Wed, 1 Jul 2015 21:55:54 +0000 (21:55 +0000)
author Kyle Mestery <mestery@mestery.com>
Wed, 1 Jul 2015 21:55:31 +0000 (21:55 +0000)
committer Kyle Mestery <mestery@mestery.com>
Wed, 1 Jul 2015 21:55:54 +0000 (21:55 +0000)
diff --cc neutron/db/migration/models/head.py
Simple merge
diff --cc setup.cfg
Simple merge
author	Kyle Mestery <mestery@mestery.com>
	Wed, 1 Jul 2015 21:55:31 +0000 (21:55 +0000)
committer	Kyle Mestery <mestery@mestery.com>
	Wed, 1 Jul 2015 21:55:54 +0000 (21:55 +0000)
		1	2
neutron/db/migration/models/head.py	patch \|	diff1 \|	diff2 \|	blob \| history
setup.cfg	patch \|	diff1 \|	diff2 \|	blob \| history