]> mj.ucw.cz Git - nsc-5.git/commitdiff
Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/nsc
authorroot <root@ucw.cz>
Sat, 22 Oct 2011 20:51:22 +0000 (22:51 +0200)
committerroot <root@ucw.cz>
Sat, 22 Oct 2011 20:51:22 +0000 (22:51 +0200)

Trivial merge