Victor Vieux c61f57d040 Merge branch 'master' into bump_v0.6.7		2013-11-21 17:40:29 -08:00
docs	update docker search to reflect future changes of the api	2013-10-31 19:14:11 -07:00