Merge branch 'master' into dev

2016-04-18 01:02:44 -07:00 · 2016-04-18 01:02:44 -07:00 · a9f68e4d2a
commit a9f68e4d2a
parent d1ecf3f323 f12af17238
5 changed files with 11983 additions and 11955 deletions
--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2016-04-17.1369H
+2016-04-18.1370H
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php