Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sun, 15 Sep 2013 07:54:08 +0000 (09:54 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sun, 15 Sep 2013 07:54:08 +0000 (09:54 +0200)
1  2 
lib/automake.mk

diff --cc lib/automake.mk
Simple merge