[proj4js] 03/06: Merge tag 'upstream/2.3.12+ds'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository proj4js.

commit e2d290ace8637be334b7a12317f6560f97d278ea
Merge: d94be28 e2c1834
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 10 11:44:22 2015 +0200

    Merge tag 'upstream/2.3.12+ds'
    
    Upstream version 2.3.12+ds

 bower.json        |  2 +-
 component.json    |  2 +-
 dist/proj4-src.js | 31 ++++++++++++++++++-------------
 lib/datum.js      | 21 ++++++++++-----------
 lib/wkt.js        |  8 +++++++-
 package.json      |  2 +-
 test/test.js      | 10 ++++++++++
 7 files changed, 48 insertions(+), 28 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj4js.git