From: Călin-Andrei Burloiu <calin.burloiu@gmail.com>
Date: Sat, 4 Feb 2012 15:01:30 +0000 (+0200)
Subject: Merge branch 'master' of koala.cs.pub.ro:living-lab-site
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=7ad398a850d839a660dd235f0e2731c875d9b2ee;p=living-lab-site.git

Merge branch 'master' of koala.cs.pub.ro:living-lab-site
---

7ad398a850d839a660dd235f0e2731c875d9b2ee