Merge branch 'master' of ssh://repo.or.cz/srv/git/slick.ecio
commitbbc1a9737feb7a76243b23dc09670bba82d1916e
authorJohn <john@arch-virt-home>
Sun, 15 Apr 2012 10:29:00 +0000 (15 13:29 +0300)
committerJohn <john@arch-virt-home>
Sun, 15 Apr 2012 10:29:00 +0000 (15 13:29 +0300)
tree70644eb13a54b35c32d783d6c653a66f15dbf706
parent9f932c3e1cc1415343cebad78f2888fe7e52a7f4
parent1f5e000cb32074460fb09e30c88613f4ee48be0d
Merge branch 'master' of ssh://repo.or.cz/srv/git/slick.ecio