Merge with master

2014-02-19 08:00:02 +00:00 · 2014-02-19 08:00:02 +00:00 · 51f69dc189
parent 600816303f
commit 51f69dc189
2 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "dimple",
-  "version": "1.1.3",
+  "version": "1.1.6",
  "private": true,
  "licenses": [
    {
--- a/src/begin.js
+++ b/src/begin.js
@ -4,7 +4,7 @@

 // Create the stub object
 var dimple = {
-    version: "1.1.2",
+    version: "1.1.6",
    plot: {},
    aggregateMethod: {}
 };