Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 17 Aug 2013 13:08:21 +0000 (15:08 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 17 Aug 2013 13:08:21 +0000 (15:08 +0200)
commit77d14d9c7f9ce7245eff56aacd420646577892d0
tree501e443eb2b6079c6cb0c93e33ba9930aee97037
parenta91da17ea6f910863c2a771ebfa4100bbad3f481
parenta0014912b714f41d34eb6a11ae838aec981491ab
Merge branch 'mainstream'