# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1460988021 -7200
# Node ID 89c26af3226f0533641beb04958f9b3bf74b525c
# Parent  ebf7feb50352ac8b256383d72476fe97d0f0ec20
Merged markup.py changes from version 1.10.

diff -r ebf7feb50352 -r 89c26af3226f markup.py
--- a/markup.py	Mon Apr 18 00:31:34 2016 +0200
+++ b/markup.py	Mon Apr 18 16:00:21 2016 +0200
@@ -2,12 +2,13 @@
 # with absolutely no warranty and you can do
 # absolutely whatever you want with it.
 
-__date__ = '1 October 2012'
-__version__ = '1.9'
+__date__ = '16 March 2015'
+__version__ = '1.10'
 __doc__= """
 This is markup.py - a Python module that attempts to
 make it easier to generate HTML/XML from a Python program
 in an intuitive, lightweight, customizable and pythonic way.
+It works with both python 2 and 3.
 
 The code is in the public domain.
 
@@ -28,6 +29,7 @@
     # python 3
     basestring = str
     string = str
+    long = int
 
 # tags which are reserved python keywords will be referred 
 # to by a leading underscore otherwise we end up with a syntax error