]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 19 Mar 2014 21:36:50 +0000 (22:36 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 19 Mar 2014 21:36:50 +0000 (22:36 +0100)
commitc0a2b2ab103d18073dfb0d6a93caa4fd7644c775
tree844551eef02b618220ed4673926553511e5b2b2e
parentcb1fc9ad29e2cb0122fde9dd76c5275ba5dc7d14
parent9e33f93cf71fe7922af7bf227182d9d49bb48bd2
Merge branch 'dev' into diadems