An experimental commit, needed to test setup.py.

Leo build: 20141123044208
Merge branch 'master' of https://github.com/leo-editor/leo-editor

Conflicts:
	leo/core/commit_timestamp.json

Leo build: 20141123044428