GitHub PushEvent at 2014-09-30 04:48:03
Repository: interactivespaces
Actor: grafnu
Payload: {"shas":[["ce23faca8408969d115fb4e0eefeb17323cc831b","7f993876e6bed3a2315020afda2195534816ba50@google.com","Restore controller switch","Trevor Pering",true],["3b40412d2fa374d7697250ea981eeeb51c30b9ba","7f993876e6bed3a2315020afda2195534816ba50@google.com","Restoring contoller switch","Trevor Pering",true],["c1b2169636d5f446454ae3cc5f2b065af6c9e079","7f993876e6bed3a2315020afda2195534816ba50@google.com","Adding environment args","Trevor Pering",true],["64ebd9b84770d410291cf6c2601766a74b8369fb","7f993876e6bed3a2315020afda2195534816ba50@google.com","Merge branch 'standalone' of https://github.com/interactivespaces/interactivespaces into standalone\n\nConflicts:\n\tinteractivespaces-controller/src/main/java/interactivespaces/controller/internal/osgi/OsgiControllerActivator.java\n\tinteractivespaces_build/template-common/bin/startup_linux.bash","Trevor Pering",true]],"size":4,"ref":"refs/heads/standalone","head":"64ebd9b84770d410291cf6c2601766a74b8369fb"}