Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 24 Sep 2012 13:26:21 +0000 (15:26 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 24 Sep 2012 13:26:21 +0000 (15:26 +0200)
commit91ae5bece01cfe69741f9e284d0ccf78fce87eb0
treee3866996f51bf486dcc278c1ed2343b821d19389
parent2977805cbd34f50becafa505395ccb0735197ed7
parent5396b42ca2a14c760cb2d32e7ec59525866fddbb
Merge branch 'mainstream'