Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 7 Sep 2013 13:48:06 +0000 (15:48 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 7 Sep 2013 13:48:06 +0000 (15:48 +0200)
commit3442636d01d2a73a557952ad9140de07418c28c2
tree7fa1c67e76f0fdfd1f5004879bbc543507a3a613
parentfd76a6f94338b668175336434b156827458b5e7d
parentfe7fe47b84fce27a05a6c97bf2c33aeb885442ee
Merge branch 'mainstream'