]> git.parisson.com Git - piplayer.git/commit
Merge branch 'dev' master
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 24 Oct 2013 17:21:54 +0000 (19:21 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 24 Oct 2013 17:21:54 +0000 (19:21 +0200)
commit5200ea924302a1ea3e54e56b4f039ba837b9d13a
tree628d90bb383129717fcbc5f092f419ed6171de4c
parent7d392372850cc3822ceb589182b45126b97c25d6
parenta6b31551d79a6b3dc09ac02fc903b09123a3c0fb
Merge branch 'dev'