merge Makefile

This commit is contained in:
gwen 2013-09-16 14:52:42 +02:00
commit 327cce6fed