From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Thu, 1 Mar 2012 09:25:56 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/edu/osp-wiki
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/edu/osp-wiki.git/commitdiff_plain/38553ed090268497b5cb1b4e66790b7482089e15?hp=47d167c911cdff720eaba7f850a8b6989892ae9b

Merge branch 'master' of rtime.felk.cvut.cz:/edu/osp-wiki
---

diff --git a/student/2012.mdwn b/student/2012.mdwn
index 2849ba7b..ab790f34 100644
--- a/student/2012.mdwn
+++ b/student/2012.mdwn
@@ -10,7 +10,7 @@
 * [[Důras Matěj|durasmat/]]
 * [[Dušátko Zdeněk|dusatzde/]]
 * [[Dvořák Jan|dvoraj57/]]
-* [[Dzian Rosion Versace|dzianr1/]]
+* [[Dzian Rosion Versace|dzianros/]]
 * [[Filip Pavel|filippa5/]]
 * [[Fišera Marek|fiserma5/]]
 * [[Fous Martin|fousmart/]]
diff --git a/student/dzianr1/index.mdwn b/student/dzianros/index.mdwn
similarity index 96%
rename from student/dzianr1/index.mdwn
rename to student/dzianros/index.mdwn
index 9bb7e94f..f719723c 100644
--- a/student/dzianr1/index.mdwn
+++ b/student/dzianros/index.mdwn
@@ -35,4 +35,4 @@ Například: <a href='https://www.ohloh.net/accounts/9897?ref=Detailed'>
   <img alt='Ohloh profile for Linus.Torvalds' height='35' src='https://www.ohloh.net/accounts/9897/widgets/account_detailed.gif' width='191' />
 </a>
 
-[w]:https://www.ohloh.net/accounts/dzianr1/widgets
+[w]:https://www.ohloh.net/accounts/dzianros/widgets