tree a016c0f08804dede18110b2ca2b5a1775bae6424
parent 239ff7e1a021b2e4dca092d8b36ba7702f02f86c
parent 1b476d5f8b3e52e7e57df3d3bddeaabb75fbbef8
author Florian Loitsch <florian@loitsch.com> 1384064953 +0100
committer Florian Loitsch <florian@loitsch.com> 1384064953 +0100

Merge branch 'whitespace'

Conflicts:
	Changelog
	src/double-conversion.cc
	src/double-conversion.h