From: root p2p-next-02 <root@p2p-next-02.grid.pub.ro>
Date: Fri, 17 Jun 2011 21:48:46 +0000 (+0300)
Subject: Merge branch 'master' of koala.cs.pub.ro:cs-p2p-next
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=d5197f8549eacbaa4a2708d0529366e23a71aacb;p=cs-p2p-next.git

Merge branch 'master' of koala.cs.pub.ro:cs-p2p-next
---

d5197f8549eacbaa4a2708d0529366e23a71aacb