Update convert, regex from develop.

This commit is contained in:
Automated Commit 2014-06-29 13:00:04 -04:00
parent 027a300667
commit 0159eabcba
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 23278f3f984b34ec05c9410aeac21d355ec531b3
Subproject commit b5d9191b9e9cd7e20fcc4486a521c43c36d04bb9

@ -1 +1 @@
Subproject commit d90fa5bb9271be9cae33a9eb131e978ea8810e7a
Subproject commit 7bdb2122d4b2dff910c0b6faf658af8587b0da82