3 Commits

Author	SHA1	Message	Date
Guillaume J. Charmes	f72e604872	Merge branch 'master' into docker-osx	2013-11-28 21:16:32 -08:00
Guillaume J. Charmes	a990b3aeb9	Correct comments	2013-11-28 11:02:53 -08:00
Guillaume J. Charmes	533067bba4	Rename file for consistency	2013-11-28 10:37:03 -08:00