]> git.parisson.com Git - timeside.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 17 Oct 2013 01:03:01 +0000 (03:03 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 17 Oct 2013 01:03:01 +0000 (03:03 +0200)
commiteccd73ad436751601b2968236cde99b2157aaedb
tree8c49c7532219cba891649fc18d19ce53a3fbcc85
parentc6f4acbfc19c2d9d80f6765d44be45f6615a3fe0
parentb6dd036ce67662711e1ae44d3e6f781452f7d57c
Merge branch 'master' into dev

Conflicts:
README.rst