[proj4js] 04/06: Merge tag 'upstream/2.3.6+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 9504a4e2daede83c9fe2018a7af550056a7ad8d5
Merge: 1f633a4 35c7b0b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 9 22:40:40 2015 +0200

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

 bower.json        |  2 +-
 component.json    |  2 +-
 dist/proj4-src.js |  3 ++-
 lib/projString.js |  1 +
 package.json      |  2 +-
 test/amd.html     | 16 ++++++++--------
 test/test.js      |  8 +++++++-
 7 files changed, 21 insertions(+), 13 deletions(-)

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