Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume
Conflicts:
	test/integration/smoke/test_volumes.py
2013-01-16 14:00:48 -07:00
..
2013-01-09 17:48:22 -07:00