]> git.sesse.net Git - casparcg/commit
Merge branch 'master' of https://github.com/CasparCG/Server
authorHelge Norberg <helge.norberg@gmail.com>
Mon, 20 Jan 2014 12:49:46 +0000 (13:49 +0100)
committerHelge Norberg <helge.norberg@gmail.com>
Mon, 20 Jan 2014 12:49:46 +0000 (13:49 +0100)
commit82de59f04d8e297d7f027859110e312a947bcd17
tree157d74c7d8139bdd9d46113e9fee2d3e32d945d6
parent6ea15cd979f4cfc4a5382ff34e91033f1b266f39
parent4dd6016bec6755bf30a9957cfba1d5f4c0f13c0b
Merge branch 'master' of https://github.com/CasparCG/Server