[Pcgen-github] [PCGen/pcgen] ed929e: DATA-2281

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/PCGen/pcgen
  Commit: ed929e2329ff273de539614dc782d298af5e1d34
      https://github.com/PCGen/pcgen/commit/ed929e2329ff273de539614dc782d298af5e1d34
  Author: Stefan Radermacher <st...@za...>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilities_class.lst

  Log Message:
  -----------
  DATA-2281
Fix broken prerequisite for paladin's Exhausted mercy ability


  Commit: 0be04b6cd1ef2ce703e8520afab6d64eaee9ed44
      https://github.com/PCGen/pcgen/commit/0be04b6cd1ef2ce703e8520afab6d64eaee9ed44
  Author: Andrew Maitland <dre...@ya...>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilities_class.lst

  Log Message:
  -----------
  Merge pull request #36 from Zaister/DATA-2281

DATA-2281


Compare: https://github.com/PCGen/pcgen/compare/bf1b7863ea7d...0be04b6cd1ef