Merge remote-tracking branch 'origin/master' into stable

qmmr · May 19, 2012 · e264c4e · e264c4e
2 parents bfea1e1 + 725e667
commit e264c4e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/jqvmap/jquery.vmap.js b/jqvmap/jquery.vmap.js
@@ -4,6 +4,7 @@
  * http://jqvmap.com
  *
  * Copyright 2012, Peter Schmalfeldt <manifestinteractive@gmail.com>
+ * Copyright 2011-2012, Kirill Lebedev
  * Licensed under the MIT license.
  *
  * Fork Me @ https://github.com/manifestinteractive/jqvmap

diff --git a/jqvmap/jquery.vmap.min.js b/jqvmap/jquery.vmap.min.js
diff --git a/jqvmap/jquery.vmap.packed.js b/jqvmap/jquery.vmap.packed.js