Merge branch 'master' of git://github.com/ssinyagin/torrus-newfeatures
commit59349da82abe13de81f896bbed9bc766610fe896
authorStanislav Sinyagin <ssinyagin@k-open.com>
Sun, 25 Dec 2011 12:43:49 +0000 (25 13:43 +0100)
committerStanislav Sinyagin <ssinyagin@k-open.com>
Sun, 25 Dec 2011 12:43:49 +0000 (25 13:43 +0100)
treea19c3dde62da7500f2d8d74ec5de529cc8ba6cc0
parent762339039aed5b94066c17db5117179ffbdace38
parent08e1749a44b166c49da50f925f58c3214f934af2
Merge branch 'master' of git://github.com/ssinyagin/torrus-newfeatures