Merge branch 'master' of github.com:IvanMMM/DataBase

Author Ivan <ivan_90.90@mail.ru>
Author date 2014-04-07 13:15:04
Author local date 2014-04-07 17:15:04 +0400
Committer Ivan <ivan_90.90@mail.ru>
Committer date 2014-04-07 13:15:04
Committer local date 2014-04-07 17:15:04 +0400
Commit 6eb4ee40a8df358bd4fd2996e695eb33ee9781e0
Tree 374441a3729dbb7c5b13ed5bff7b182aa6ec1fae
Parent 84662efebb43e9010408e946c059f0b4a7d8feb4
Parent c6b19746b73f085754f8444649bd1357bab668f3
Merge branch 'master' of github.com:IvanMMM/DataBase