diff -Nru remindor-common-14.01/debian/changelog remindor-common-14.01.1/debian/changelog
--- remindor-common-14.01/debian/changelog	2014-01-13 22:00:20.000000000 +0000
+++ remindor-common-14.01.1/debian/changelog	2014-04-24 14:05:20.000000000 +0000
@@ -1,3 +1,9 @@
+remindor-common (14.01.1-0ubuntu1~quantal) quantal; urgency=low
+
+  * Fixed bug #1312055
+
+ -- Brian Douglass <bhdouglass@gmail.com>  Thu, 24 Apr 2014 07:55:00 -0500
+
 remindor-common (14.01-0ubuntu1~quantal) quantal; urgency=low
 
   * Added Pushbullet integration
diff -Nru remindor-common-14.01/.gitignore remindor-common-14.01.1/.gitignore
--- remindor-common-14.01/.gitignore	2013-06-18 12:43:22.000000000 +0000
+++ remindor-common-14.01.1/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-nosetests.xml
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
diff -Nru remindor-common-14.01/po/remindor-common.pot remindor-common-14.01.1/po/remindor-common.pot
--- remindor-common-14.01/po/remindor-common.pot	2014-01-13 21:59:05.000000000 +0000
+++ remindor-common-14.01.1/po/remindor-common.pot	2014-04-24 11:56:23.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-13 16:59-0500\n"
+"POT-Creation-Date: 2014-04-24 07:56-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -104,16 +104,16 @@
 msgid "Command"
 msgstr ""
 
-#: ../remindor_common/database.py:214
+#: ../remindor_common/database.py:217
 msgid "Quick Reminder"
 msgstr ""
 
-#: ../remindor_common/database.py:214 ../remindor_common/datetimeutil.py:974
+#: ../remindor_common/database.py:217 ../remindor_common/datetimeutil.py:974
 #: ../remindor_common/datetimeutil.py:1053
 msgid "now"
 msgstr ""
 
-#: ../remindor_common/database.py:214 ../remindor_common/datetimeutil.py:937
+#: ../remindor_common/database.py:217 ../remindor_common/datetimeutil.py:937
 #: ../remindor_common/datetimeutil.py:998
 msgid "today"
 msgstr ""
diff -Nru remindor-common-14.01/remindor_common/database.py remindor-common-14.01.1/remindor_common/database.py
--- remindor-common-14.01/remindor_common/database.py	2014-01-06 21:40:58.000000000 +0000
+++ remindor-common-14.01.1/remindor_common/database.py	2014-04-24 11:46:00.000000000 +0000
@@ -47,12 +47,15 @@
         if self.old_version < 9:
             self.fix_time_from_to()
 
+        if self.old_version < 11:
+            self.fix_time()
+
     def setup(self):
         self.execute("""CREATE TABLE IF NOT EXISTS version (id INTEGER PRIMARY KEY AUTOINCREMENT,
             version TEXT)""")
         self.old_version = self.version()
-        if self.old_version < 10:
-            self.version(10)
+        if self.old_version < 11:
+            self.version(11)
 
         #00 - id
         #01 - label
@@ -227,6 +230,13 @@
                 self.delete_alarm(reminder.id)
                 self.insert_alarm(reminder)
 
+    def fix_time(self):
+        reminder_list = self.all_alarms()
+        for reminder in reminder_list:
+            time = datetimeutil.str_time_simplify(reminder.time)
+            sql = """UPDATE alarms SET time = ?"""
+            self.execute(sql, [time])
+
     def migrate_from_couch(self):
         try:
             from desktopcouch.records.server import CouchDatabase
diff -Nru remindor-common-14.01/remindor_common/__init__.py remindor-common-14.01.1/remindor_common/__init__.py
--- remindor-common-14.01/remindor_common/__init__.py	2014-01-07 01:53:50.000000000 +0000
+++ remindor-common-14.01.1/remindor_common/__init__.py	2014-04-24 11:46:56.000000000 +0000
@@ -15,4 +15,4 @@
 ### END LICENSE
 
 def version():
-    return '14.01'
+    return '14.01.1'
diff -Nru remindor-common-14.01/setup.py remindor-common-14.01.1/setup.py
--- remindor-common-14.01/setup.py	2014-01-07 01:54:15.000000000 +0000
+++ remindor-common-14.01.1/setup.py	2014-04-24 11:46:40.000000000 +0000
@@ -27,7 +27,7 @@
 
 DistUtilsExtra.auto.setup(
     name='remindor-common',
-    version='14.01',
+    version='14.01.1',
     license='GPL-3',
     author='Brian Douglass',
     author_email='bhdouglass@gmail.com',
diff -Nru remindor-common-14.01/tests/test_date_validation2.py remindor-common-14.01.1/tests/test_date_validation2.py
--- remindor-common-14.01/tests/test_date_validation2.py	2013-12-06 01:20:23.000000000 +0000
+++ remindor-common-14.01.1/tests/test_date_validation2.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-#!/usr/bin/python
-
-import os, sys
-sys.path.insert(0, os.getcwd())
-
-import remindor_common.datetimeutil2 as d
-
-valid_singular = [
-    'today',
-    'tomorrow',
-    'yesterday',
-    'Monday',
-    'mon',
-    'next MON',
-    'nx monday',
-    'next friday',
-    'October 28, 2012',
-    'oct 28',
-    '9/28/2012',
-    '9/28',
-    '9-28-2012',
-    '9-28',
-    '5',
-    '+5',
-    '-5',
-    'next 31',
-    'next 1',
-    'next 28',
-    'christmas',
-    'next christmas',
-    'christmas eve',
-    'next christmas eve',
-    'new years',
-    'next new years',
-    'new years eve',
-    'next new years eve',
-    'easter',
-    'next easter',
-    'groundhogs day',
-    'next groundhogs day',
-    'valentines day',
-    'next valentines day',
-    'halloween',
-    'next halloween'
-    ]
-
-valid_repeating = [
-    'every monday',
-    'every monday from 9/28/2012',
-    'every monday from 2 to 30',
-    'every day',
-    'every day from -5',
-    'every day from -5 to +5',
-    'every 30',
-    'every 30 from 9/28',
-    'every 30 from 1 to next 31',
-    'every 30 days',
-    'every 30 days from next 5',
-    'every 30 days from 2/28 to next monday',
-    'every weekday',
-    'every weekday from monday',
-    'every weekday from monday to next monday',
-    'every weekend',
-    'every weekend from sun',
-    'every weekend from Oct 8, 2012 to October 8, 2013',
-    'every other',
-    'every other from 5',
-    'every other from 5 to 10',
-    'next 30 days',
-    'next 30 days from yesterday',
-    'every 3 weeks',
-    'every 3 months',
-    'every 3 years',
-    'every days',
-    'every mon,tues',
-    'every tues, thursday'
-    ]
-
-invalid = ['asdf', '532asdf', 'every asdf', 'nx asdf', 'monday tomorrow', 'tomorrow every',
-    'every 30 from asdf', 'every 30 asdf', 'every 30 days from asdf', 'every 30 from', 'm',
-    'every 33', 'next monday from 8', 'every monday to 8', 'toda', 'next weekday', 'next day',
-    'next 30 monday', 'asdf 12 2012', 'every other day', 'every other from', 'weekday next',
-    '30 weekday', 'next 30 monday', 'every tomorrow', 'every m', 'next other',
-    'every day from 8 to 7', '', 'next 30 days from 5 to 6', 'every day from to', 'next -1',
-    '8:30pm', '13:02', 'years', 'every asdf,tues', 'every tues, asdf']
-
-format = d.BaseFormat()
-
-print 'testing valid singular dates'
-for row in valid_singular:
-    print '?' + row + '?'
-    date = d.Date(row, format)
-    date.parse()
-    print '!' + str(date.time) + '!'
-
-    if not date.valid:
-        print 'invalid!'
-        exit()
-
-print ''
-print 'testing valid repeating dates'
-for row in valid_repeating:
-    print '?' + row + '?'
-    date = d.Date(row, format)
-    date.parse()
-    print '!' + str(date.time) + '!'
-
-    if not date.valid:
-        print 'invalid!'
-        exit()
-
-print ''
-print 'testing invalid dates'
-for row in invalid:
-    print row
-    date = d.Date(row, format)
-    date.parse()
-    #print date.time
-
-    if date.valid:
-        print '!' + str(date.time) + '!'
-        print 'valid!'
-        exit()
-
-print ''
-print 'test successful'
diff -Nru remindor-common-14.01/tests/test_date_validation.py remindor-common-14.01.1/tests/test_date_validation.py
--- remindor-common-14.01/tests/test_date_validation.py	2013-10-22 11:35:23.000000000 +0000
+++ remindor-common-14.01.1/tests/test_date_validation.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-import remindor_common.datetimeutil as d
-
-valid_singular = [
-    "today",
-    "tomorrow",
-    "yesterday",
-    "Monday",
-    "mon",
-    "next MON",
-    "nx monday",
-    "next friday",
-    "October 28, 2012",
-    "oct 28",
-    "9/28/2012",
-    "9/28",
-    "9-28-2012",
-    "9-28",
-    "5",
-    "+5",
-    "-5",
-    "next 31",
-    "next 1",
-    "next 28"
-    ]
-
-valid_repeating = [
-    "every monday",
-    "every monday from 9/28/2012",
-    "every monday from 2 to 30",
-    "every day",
-    "every day from -5",
-    "every day from -5 to +5",
-    "every 30",
-    "every 30 from 9/28",
-    "every 30 from 1 to next 31",
-    "every 30 days",
-    "every 30 days from next 5",
-    "every 30 days from 2/28 to next monday",
-    "every weekday",
-    "every weekday from monday",
-    "every weekday from monday to next monday",
-    "every weekend",
-    "every weekend from sun",
-    "every weekend from Oct 8, 2012 to October 8, 2013",
-    "every other",
-    "every other from 5",
-    "every other from 5 to 10",
-    "next 30 days",
-    "next 30 days from yesterday",
-    "every 3 weeks",
-    "every 3 months",
-    "every 3 years",
-    "every days"
-    ]
-
-invalid = ["asdf", "532asdf", "every asdf", "nx asdf", "monday tomorrow", "tomorrow every",
-    "every 30 from asdf", "every 30 asdf", "every 30 days from asdf", "every 30 from", "m",
-    "every 33", "next monday from 8", "every monday to 8", "toda", "next weekday", "next day",
-    "next 30 monday", "asdf 12 2012", "every other day", "every other from", "weekday next",
-    "30 weekday", "next 30 monday", "every tomorrow", "every m", "next other",
-    "every day from 8 to 7", "", "next 30 days from 5 to 6", "every day from to", "next -1",
-    "8:30pm", "13:02", "years"]
-
-print "testing valid singular dates"
-for row in valid_singular:
-    print "?" + row + "?"
-    value = d.str_date_simplify(row, 0)
-    print "!" + str(value) + "!"
-
-    if value == None:
-        print "value should not be None!"
-        exit()
-
-print ""
-print "testing valid repeating dates"
-for row in valid_repeating:
-    print "?" + row + "?"
-    value = d.str_date_simplify(row, 0)
-    print "!" + str(value) + "!"
-
-    if value == None:
-        print "value should not be None!"
-        exit()
-
-print ""
-print "testing invalid dates"
-for row in invalid:
-    print row
-    value = d.str_date_simplify(row, 0)
-    print value
-
-    if value != None:
-        print "value should be None!"
-        exit()
-
-print ''
-print 'test successful'
diff -Nru remindor-common-14.01/tests/test_simple_parse.py remindor-common-14.01.1/tests/test_simple_parse.py
--- remindor-common-14.01/tests/test_simple_parse.py	2013-06-21 12:47:08.000000000 +0000
+++ remindor-common-14.01.1/tests/test_simple_parse.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-from remindor_common import datetimeutil as d
-
-valid = [
-    "exercise every 1 day at 6 am",
-    "exercise every 3 days at 6 pm",
-    "exercise every 3 weeks at 6 pm",
-    "exercise every 3 months at 6 pm",
-    "exercise every 3 years at 6 pm",
-    "board meeting on 8/7/13 at 2:30 am",
-    "board meeting on next monday at 2:30pm",
-    "travel home on 8/7/13",
-    "travel home on next monday",
-    "meet bob at 6:15am",
-    "meet bob at 6:15 pm",
-    "take pills every 4 hours",
-    "take pills every 1 minute",
-    "exercise every 3 days",
-    "exercise every 3 week",
-    "exercise every 3 years",
-    "go to the store in 20 minutes",
-    "go to the store in 2 hour",
-    "exercise ever 1 days at 6 pm", #actually valid because of the at
-    "at 6:15pm" #actually valid without a label
-    ]
-
-invalid = [
-    "exercise every x days at 6 pm",
-    #"exercise ever 1 days at 6 pm", #actually valid because of the at
-    "exercise every 3 days at 6x",
-    "exercise",
-    "exercise every at",
-    "exercise at",
-    "exercise every",
-    "board meeting on 2:30 pm",
-    "at 6:15pm meet bob",
-    #"at 6:15pm", #actually valid without a label
-    "go to the store in 20 days"
-    ]
-
-print "parsing valid"
-for row in valid:
-    print row
-    parsed = d.simple_parse(row)
-    print parsed
-
-    if parsed[0] == None or parsed[1] == None:
-        print "Should not be none!"
-        exit()
-
-print "\nparsing invalid"
-for row in invalid:
-    print row
-    parsed = d.simple_parse(row)
-    print parsed
-
-    if parsed[0] != None or parsed[1] != None:
-        print "Should be none!"
-        exit()
diff -Nru remindor-common-14.01/tests/test_str_to_day.py remindor-common-14.01.1/tests/test_str_to_day.py
--- remindor-common-14.01/tests/test_str_to_day.py	2013-10-22 11:36:45.000000000 +0000
+++ remindor-common-14.01.1/tests/test_str_to_day.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,128 +0,0 @@
-from datetime import datetime, timedelta
-from dateutil import parser
-import remindor_common.datetimeutil as d
-
-singular = [
-    "today",
-    "tomorrow",
-    "yesterday",
-    "Monday",
-    "mon",
-    "next MON",
-    "nx monday",
-    "October 28, 2012",
-    "oct 28",
-    "9/28/2012",
-    "9/28",
-    "9-28-2012",
-    "9-28",
-    "5",
-    "+5",
-    "-5",
-    "next 31",
-    "next 1",
-    "next 28"
-    ]
-
-today = datetime.today()
-today = today.replace(hour=0, minute=0, second=0, microsecond=0)
-valid_singular = [
-    today,
-    today + timedelta(days=1),
-    today - timedelta(days=1),
-    parser.parse("monday"),
-    parser.parse("monday"),
-    parser.parse("monday") + timedelta(days=7),
-    parser.parse("monday") + timedelta(days=7),
-    datetime(2012, 10, 28),
-    datetime(2012, 10, 28),
-    datetime(2012, 9, 28),
-    datetime(2012, 9, 28),
-    datetime(2012, 9, 28),
-    datetime(2012, 9, 28),
-    today + timedelta(days=5),
-    today + timedelta(days=5),
-    today - timedelta(days=5),
-    datetime(2012, 10, 31), #set this manually
-    datetime(2012, 10, 1), #set this manually
-    datetime(2012, 10, 28) #set this manually
-    ]
-
-repeating = [
-    "every monday",
-    "every monday from 9/28/2012",
-    "every monday from 2 to 30",
-    "every day",
-    "every day from -5",
-    "every day from -5 to +5",
-    "every 30",
-    "every 30 from 9/28",
-    "every 30 from next 1 to next 31",
-    "every 30 days",
-    "every 30 days from next 5",
-    "every 30 days from 9/28 to next monday",
-    "every weekday",
-    "every weekday from monday",
-    "every weekday from monday to next monday",
-    "every weekend",
-    "every weekend from sun",
-    "every weekend from Oct 8, 2012 to October 8, 2013",
-    "every other",
-    "every other from 5",
-    "every other from 5 to 10",
-    "next 30 days",
-    "next 30 days from yesterday",
-    ]
-
-#set these manually
-valid_repeating = [
-    "every monday",
-    "every monday from 9/28/2012",
-    "every monday from 2 to 30",
-    "every day",
-    "every day from -5",
-    "every day from -5 to +5",
-    "every 30",
-    "every 30 from 9/28",
-    "every 30 from next 1 to next 31",
-    "every 30 days",
-    "every 30 days from next 5",
-    "every 30 days from 9/28 to next monday",
-    "every weekday",
-    "every weekday from monday",
-    "every weekday from monday to next monday",
-    "every weekend",
-    "every weekend from sun",
-    "every weekend from Oct 8, 2012 to October 8, 2013",
-    "every other",
-    "every other from 5",
-    "every other from 5 to 10",
-    "next 30 days",
-    "next 30 days from yesterday",
-    ]
-
-counter = 0
-for row in singular:
-    value = d.str_date_simplify(row, 0)
-    print str(value) + " (" + row + ")"
-    dt = d.str_to_date(None, value)
-    print dt
-
-    if dt != valid_singular[counter]:
-        print "should be " + str(valid_singular[counter])
-        exit()
-
-    counter += 1
-
-counter = 0
-for row in repeating:
-    value = d.str_date_simplify(row, 0)
-    print str(value) + " (" + row + ")"
-    dt = d.str_to_date(None, value)
-    print dt
-
-    '''if dt != valid_singular[counter]:
-        print "should be " + str(valid_singular[counter])
-        exit()'''
-
-    counter += 1
diff -Nru remindor-common-14.01/tests/test_time_validation.py remindor-common-14.01.1/tests/test_time_validation.py
--- remindor-common-14.01/tests/test_time_validation.py	2013-10-22 11:36:51.000000000 +0000
+++ remindor-common-14.01.1/tests/test_time_validation.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-import remindor_common.datetimeutil as d
-
-valid_singular = [
-    "now",
-    "1:00pm",
-    "1:00 pm",
-    "13:00",
-    "13",
-    "1300",
-    "1pm"
-    ]
-
-valid_repeating = [
-    "every hour",
-    "every hour from 1 to 1:00pm",
-    "every minute",
-    "every minute from 2:00pm to 1500",
-    "every 3 minutes",
-    "every 3 minutes from 3:30pm to 3:45 pm",
-    "every 2 hours",
-    "every 2 hours from 8 to 10"
-    ]
-
-invalid = [
-    "every minute from",
-    "asdf",
-    "every minutes to 3",
-    "2500",
-    "25",
-    "-1",
-    "every -2 minutes",
-    "every minute from 5 to 1",
-    "every minute from 5 to 5",
-    "8/12/13",
-    "October 12",
-    "7-21-2013"
-    ]
-
-print "testing valid singular times"
-for row in valid_singular:
-    print "?" + row + "?"
-    value = d.str_time_simplify(row)
-    print "!" + str(value) + "!"
-
-    if value == None:
-        print "value should not be None!"
-        exit()
-
-print ""
-print "testing valid repeating times"
-for row in valid_repeating:
-    print "?" + row + "?"
-    value = d.str_time_simplify(row)
-    print "!" + str(value) + "!"
-
-    if value == None:
-        print "value should not be None!"
-        exit()
-
-print ""
-print "testing invalid times"
-for row in invalid:
-    print row
-    value = d.str_time_simplify(row)
-    print value
-
-    if value != None:
-        print "value should be None!"
-        exit()