Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 10 Dec 2013 13:38:28 +0000 (14:38 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 10 Dec 2013 13:38:28 +0000 (14:38 +0100)
commit6b4b2f598246e87237342a9179a0d29e202ebe65
tree363aa67a7c3ddf205ca3e907eab30aa756e31533
parentf263172c99fd0a72c3f6666ffbaeaab786a3f1a8
parentdeaa2985faa924fe2f87f669bdcd35617ffe774f
Merge branch 'mainstream'
lib/automake.mk