gistfile1.txt

# push some change to the 'test' branch
# IRC message is good
[10:34:11] --> github-tmw ([email protected]) has joined #themanaworld-dev
[10:34:11] -- Notice(github-tmw): [tmwa] o11c pushed 3 new commits to test: http://git.io/EIqnNA
[10:34:11] -- Notice(github-tmw): tmwa/test d2c34c4 Ben Longbons: Make some npc errors better
[10:34:11] -- Notice(github-tmw): tmwa/test d3beae7 Ben Longbons: Add dumpers for the rest of the stack types
[10:34:11] -- Notice(github-tmw): tmwa/test 23c0f35 Ben Longbons: Refactor npc event timers to have an expired state...
[10:34:11] <-- github-tmw ([email protected]) has left #themanaworld-dev

# push that same changeset to the 'master' branch
# IRC message is good
[11:00:38] --> github-tmw ([email protected]) has joined #themanaworld-dev
[11:00:38] -- Notice(github-tmw): [tmwa] o11c merged test into master: http://git.io/qfZLPQ
[11:00:38] <-- github-tmw ([email protected]) has left #themanaworld-dev

# push a new commit to both branches
# IRC message is bad, but the git.io link is good
[11:34:09] --> github-tmw ([email protected]) has joined #themanaworld-dev
[11:34:10] -- Notice(github-tmw): [tmwa] o11c merged master into test: http://git.io/8intsg
[11:34:10] <-- github-tmw ([email protected]) has left #themanaworld-dev