Merge branch 'master' of git://repo.or.cz/SkiSchool
commit741b1f6ca0774d44695b786784733ec74a5a07c7
authorgias <gias89@gmail.com>
Mon, 28 Feb 2011 16:26:34 +0000 (28 17:26 +0100)
committergias <gias89@gmail.com>
Mon, 28 Feb 2011 16:26:34 +0000 (28 17:26 +0100)
treea86fd561d28d93cce45a38a42943750a6a8ad9af
parent8b57276da00e8fde5595046817387b60c41b16e1
parent8c3b5c82003805bfaadc6dd27656d39b4005ab36
Merge branch 'master' of git://repo.or.cz/SkiSchool