[Pcgen-github] [PCGen/pcgen] 09b5b3: DATA-2262

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

  Branch: refs/heads/master
  Home:   https://github.com/PCGen/pcgen
  Commit: 09b5b3160e972176d38669171492f5a52068c9f1
      https://github.com/PCGen/pcgen/commit/09b5b3160e972176d38669171492f5a52068c9f1
  Author: LegacyKing <dre...@ya...>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_abilities_class.lst

  Log Message:
  -----------
  DATA-2262
[Pathfinder] Master granted bonuses from familiars have conflicts


  Commit: a87ccc9849ca16132ba999805836e4d3431a6b2f
      https://github.com/PCGen/pcgen/commit/a87ccc9849ca16132ba999805836e4d3431a6b2f
  Author: Andrew Maitland <dre...@ya...>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_abilities_class.lst

  Log Message:
  -----------
  Merge pull request #24 from LegacyKing/DATA-2262a

DATA-2262


Compare: https://github.com/PCGen/pcgen/compare/d597a57b9108...a87ccc9849ca