buttonmen-dev/buttonmen — pull request #1331 by cgolubi1 (2014-09-27 13:54:17+00:00)
Title: pull changes from master to dev on 2014-09-27

This update brings these approved pulls to the dev branch:
* User-visible:
* #1319: add more information to error messages for ambiguous default attacks
* Ideally not user-visible:
* #1320: change the reroll behavior to eliminate unused intermediate rolls for morphing and trip dice
* #1297: redo the DB to use explicit button IDs
* #1325: jenkins system administration

Database updates:
```
01286_explicit_ids.sql
```

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.