Release notes

[Stéfan van der Walt]

On Thu, Aug 14, 2014 at 11:22 PM, Johannes Sch önberger <jsch at demuc.de> wrote:
> Thanks for letting us know. I have not thought of this, but I can definitely see this happening in our case as well. Separate files in a subdirectory sound as a good workaround. What do the other think?

I saw this in the IPython project as well--should have thought of the
merge conflicts.  +1 for adopting a similar approach.

Stéfan