Merge branch 'master' into remove-extras

This commit is contained in:
Bryan Bishop 2013-08-03 13:49:27 -05:00
commit 81c5b26945

View File

@ -31,4 +31,3 @@ Eventually this will not be necessary.
* Hang out with us on irc: **[nucleus.kafuka.org #skeetendo](https://kiwiirc.com/client/irc.nolimitzone.com/?#skeetendo)** * Hang out with us on irc: **[nucleus.kafuka.org #skeetendo](https://kiwiirc.com/client/irc.nolimitzone.com/?#skeetendo)**
* Disassembly of **[Pokémon Red](http://bitbucket.org/iimarckus/pokered)**. * Disassembly of **[Pokémon Red](http://bitbucket.org/iimarckus/pokered)**.