[SCM] supercollider/master: Imported Upstream version 3.6.1~repack

[Felipe Sateler]

On Fri, Dec 28, 2012 at 10:48 AM, Felipe Sateler <fsateler at debian.org> wrote:
> On Thu, Dec 27, 2012 at 11:11 AM, Dan S <danstowell+debmm at gmail.com> wrote:
>
>> and it rejected the non-fast-forward. Seems pretty certain that I
>> cannot rewrite remote history; perhaps because I'm a -guest.
>
> I'll try tonight.

Sorry for tthe delay. I couldn't rewrite history by doing git push,
but I could manually reset the head to the correct place. The only
problem is that the merge commit is now credited to me. I hope that is
OK.

--

Saludos,
Felipe Sateler