Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 6 Jul 2013 17:00:44 +0000 (19:00 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 6 Jul 2013 17:00:44 +0000 (19:00 +0200)
commita12945b3b8cd4d483e5e8f2a1adb6576badf1d4d
treec1a4d232710d4f43fb56b7efd0b68d8f5fa7a6bf
parentf567ab92db2443285842cc3c8d91fdd37c986637
parent1b936472569dbaf1d6140c06789890ea01967456
Merge branch 'mainstream'
Makefile.am