From: Antonio Ospite <ospite@studenti.unina.it>
Date: Wed, 21 Mar 2012 10:45:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/rettichschnidi' into unstable
X-Git-Tag: v0.1.0~1^2~9
X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/f02525e0c94885e18a7cff407d87184db6b9c0ff?ds=inline;hp=f02525e0c94885e18a7cff407d87184db6b9c0ff

Merge remote-tracking branch 'origin/rettichschnidi' into unstable

Conflicts:
	examples/am7xxx-play.c
---