Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating

88ceb036 · PavelBegunkov · f1909b7d · a8c15988 · 88ceb036 · 88ceb036
Commit 88ceb036 authored 10 years ago by PavelBegunkov
--- a/modules/database/classes/Database/Result/Cached.php
+++ b/modules/database/classes/Database/Result/Cached.php
--- a/modules/database/classes/Kohana/Config/Database.php
+++ b/modules/database/classes/Kohana/Config/Database.php
--- a/modules/database/classes/Kohana/Config/Database/Reader.php
+++ b/modules/database/classes/Kohana/Config/Database/Reader.php
--- a/modules/database/classes/Kohana/Config/Database/Writer.php
+++ b/modules/database/classes/Kohana/Config/Database/Writer.php
--- a/modules/database/classes/Kohana/DB.php
+++ b/modules/database/classes/Kohana/DB.php
--- a/modules/database/classes/Kohana/Database.php
+++ b/modules/database/classes/Kohana/Database.php
--- a/modules/database/classes/Kohana/Database/Exception.php
+++ b/modules/database/classes/Kohana/Database/Exception.php
--- a/modules/database/classes/Kohana/Database/Expression.php
+++ b/modules/database/classes/Kohana/Database/Expression.php
--- a/modules/database/classes/Kohana/Database/MySQL.php
+++ b/modules/database/classes/Kohana/Database/MySQL.php
--- a/modules/database/classes/Kohana/Database/MySQL/Result.php
+++ b/modules/database/classes/Kohana/Database/MySQL/Result.php
--- a/modules/database/classes/Kohana/Database/PDO.php
+++ b/modules/database/classes/Kohana/Database/PDO.php
--- a/modules/database/classes/Kohana/Database/Query.php
+++ b/modules/database/classes/Kohana/Database/Query.php
--- a/modules/database/classes/Kohana/Database/Query/Builder.php
+++ b/modules/database/classes/Kohana/Database/Query/Builder.php
--- a/modules/database/classes/Kohana/Database/Query/Builder/Delete.php
+++ b/modules/database/classes/Kohana/Database/Query/Builder/Delete.php
--- a/modules/database/classes/Kohana/Database/Query/Builder/Insert.php
+++ b/modules/database/classes/Kohana/Database/Query/Builder/Insert.php
--- a/modules/database/classes/Kohana/Database/Query/Builder/Join.php
+++ b/modules/database/classes/Kohana/Database/Query/Builder/Join.php
--- a/modules/database/classes/Kohana/Database/Query/Builder/Select.php
+++ b/modules/database/classes/Kohana/Database/Query/Builder/Select.php
--- a/modules/database/classes/Kohana/Database/Query/Builder/Update.php
+++ b/modules/database/classes/Kohana/Database/Query/Builder/Update.php
--- a/modules/database/classes/Kohana/Database/Query/Builder/Where.php
+++ b/modules/database/classes/Kohana/Database/Query/Builder/Where.php
--- a/modules/database/classes/Kohana/Database/Result.php
+++ b/modules/database/classes/Kohana/Database/Result.php