]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Merge with 6a0d781695de5985f14b356c6bf23b6494d06c18
authornier <devnull@localhost>
Wed, 22 Jun 2011 16:34:54 +0000 (18:34 +0200)
committernier <devnull@localhost>
Wed, 22 Jun 2011 16:34:54 +0000 (18:34 +0200)

Trivial merge