diff options
author | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-17 18:39:43 +0400 |
---|---|---|
committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-08-17 18:39:43 +0400 |
commit | 1aa438539a4a057070270b02c6b2bbaed8a951d9 (patch) | |
tree | 6371bbba0011f409112bbc72478a98231bf43f35 /scripts | |
parent | 4073badee28f2af85bf51e22a756aee63bc81d3f (diff) | |
parent | 79b5bd602e50cc5eff4c32c85df673f7eac94862 (diff) |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
libraries/common.lib.php
libraries/config.default.php
server_synchronize.php
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/decode_bug.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php index e5a645bac8..e376ef849f 100644 --- a/scripts/decode_bug.php +++ b/scripts/decode_bug.php @@ -4,7 +4,7 @@ * Parser bug report decoder * * This is the parser bug decoder system - * Throw the bug data in teh query box, and hit submit for output. + * Throw the bug data in the query box, and hit submit for output. * * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net> * |