Merge remote-tracking branch 'telmich/master'

This commit is contained in:
Steven Armstrong 2011-10-18 15:09:50 +02:00
commit 04af96b5e3