[Pkg-javascript-commits] [leaflet] 54/301: Merge remote-tracking branch 'upstream/master'

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository leaflet.

commit d1c724530d571b3b80ec83d7a17ef4977e6a8f3b
Merge: c4ad486 4609d48
Author: fastrde <strachanski at googlemail.com>
Date:   Fri Aug 9 15:22:01 2013 +0200

    Merge remote-tracking branch 'upstream/master'

 src/dom/Draggable.js               |  2 +-
 src/layer/ImageOverlay.js          |  9 +++++++++
 src/layer/marker/Marker.js         |  2 +-
 src/layer/tile/TileLayer.Canvas.js |  2 +-
 src/map/Map.js                     |  8 ++++----
 src/map/handler/Map.BoxZoom.js     | 19 +++++++++++--------
 6 files changed, 27 insertions(+), 15 deletions(-)

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