Merge branch 'master' of koala.cs.pub.ro:living-lab-site
authorCălin-Andrei Burloiu <calin.burloiu@gmail.com>
Sat, 4 Feb 2012 15:01:30 +0000 (17:01 +0200)
committerCălin-Andrei Burloiu <calin.burloiu@gmail.com>
Sat, 4 Feb 2012 15:01:30 +0000 (17:01 +0200)
commit7ad398a850d839a660dd235f0e2731c875d9b2ee
tree6eb79f0695c5bfa9d88ccc5a3460ae4e92939453
parent9b67143bfed176ed39ed58096dc713eef4700ebd
parentfab039c8472d5018f21e03c2d445e7f827f6906f
Merge branch 'master' of koala.cs.pub.ro:living-lab-site