Merged master

apatil · apatil · commit 99f5d152ee3a · 2015-03-31T15:13:40.000-07:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,4 @@
 0.1.4.dev
-~~~~~~~~~
 - Popups allow unicode.  @apatil
 - Custom popup width width.  @ocefpaf
 - Support multiPolyLine.  @scari

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`0.1.4.dev`
`2`		`-~~~~~~~~~`
`3`	`2`	`- Popups allow unicode. @apatil`
`4`	`3`	`- Custom popup width width. @ocefpaf`
`5`	`4`	`- Support multiPolyLine. @scari`