3c85233faa89ed71cef8b318e53a282348969d9d		branch 'master' of git://gitorious.org/resistance/resistance
