resolved conflict
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sat, 21 May 2011 11:43:41 +0000 (13:43 +0200)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sat, 21 May 2011 11:43:41 +0000 (13:43 +0200)
commit28745256bfd5d639d5dbcc11e8072e329c2d277b
tree6dfe2c667d37d3e807e2c156043272b4f2e0b104
parentdcbd9de538dd8a20069475b22c5201279ac4e95b
resolved conflict
web/index_rd.php