]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Jun 2014 15:28:21 +0000 (17:28 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Jun 2014 15:28:21 +0000 (17:28 +0200)
commit3e0bef91a5b75056acf55adb5d19ccb737be7f7a
treed7c3b08c45f2df9f270718fb9675fa73041aecbb
parent5663048e4f8ef568585f65e15ee464309c0a17c3
parente7728cf7fb5c6807e0b309b9bb333dc241ec5f3e
Merge branch 'dev' into diadems