* 'master' of github.com:CocoaPods/CocoaPods: (25 commits)
  Updated CHANGELOG.md
  Added acknowledgements_path to TargetDefinition class
  Use String.empty? instead of == ""
  Made Acknowledgements Plist title configurable
  Fixed Acknowledgements file names
  Removed unnecessary () from specs
  Improved Markdown Acknowledgements unit testing
  Improved Plist Acknowledgements unit testing some more
  Improve Acknowledgements unit testing
  Improve Plist Acknowledgements unit testing a little
  Completed basic implementation of Markdown Acknowledgements subclass
  WIP: Added Markdown Acknowledgements subclass
  Added Plist Acknowledgements sub-class
  Changed Local_pod license method to license_text and added fallback to file if no text specified
  Cleaned up BananaLib fixture a little
  Simplify Acknowledgement file saving
  Correct a few typos
  Minor changes to Acknowledgements header and footer text
  Integrate acknowledgements generator into install command
  Speculative fix for possible bug when a pod has no licence
  ...