From: root Date: Sat, 22 Oct 2011 20:51:22 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/nsc X-Git-Tag: v5.1~15 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=afc8cda53925eb9ae3c54908a66f8566e6940909;p=nsc-5.git Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/nsc --- afc8cda53925eb9ae3c54908a66f8566e6940909