]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 20 Nov 2014 16:25:50 +0000 (17:25 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 20 Nov 2014 16:25:50 +0000 (17:25 +0100)
commit3380445f1d49bb88867feb5ca39504d34cc3f949
tree648a5e07c7d1ab23fe1e77582cd21ec129090351
parent0024ec07d1d09a33ac21126cf204669254eeb2e9
parenta371670f92e567b8e7916cd93a60da3acdc09f8c
Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6