Viewing all changes in revision 6.

Committer: Greg
Date: 2013-08-25 19:29:35 UTC
mfrom: <a title="Merged From 3.1.2" href="/~kivy-team/kivy/garden.tickline/revision/3.1.2">(3.1.2)
Revision ID: git-v1:9d970c7e55b974ff52f821d93016938ee18c8610

Merge branch 'master' of https://github.com/eulerreich/tickline

Conflicts:
README.md

added added

removed removed

~kivy-team/kivy/garden.tickline