buttonmen-dev/buttonmen — pull request #827 by cgolubi1 (2014-05-03 15:50:13+00:00)
Title: pull changes from master to dev on 2014-05-03

This update brings these approved pulls to the dev branch, so they can be tested on dev.buttonweavers.com:
* User-visible changes:
* #805: fix activity log for trip and morphing attacks
* #821: minor grammar fix in chance dialogue
* #825: fix option request bug affecting buttons with multiple identical option dice