Cyrus Najmabadi 2eb14aa7ca Merge branch 'master' into getRenameInfo
Conflicts:
	src/services/services.ts
2014-09-17 15:36:26 -07:00
..
2014-09-11 09:23:29 -07:00