Merge branch 'lilydev' into staging

author Federico Bruni <fedelogy@gmail.com>

Mon, 29 Sep 2014 21:18:11 +0000 (23:18 +0200)

committer Federico Bruni <fedelogy@gmail.com>

Mon, 29 Sep 2014 21:18:11 +0000 (23:18 +0200)
author Federico Bruni <fedelogy@gmail.com>
Mon, 29 Sep 2014 21:18:11 +0000 (23:18 +0200)
committer Federico Bruni <fedelogy@gmail.com>
Mon, 29 Sep 2014 21:18:11 +0000 (23:18 +0200)
diff --cc Documentation/contributor/source-code.itexi
Simple merge
author	Federico Bruni <fedelogy@gmail.com>
	Mon, 29 Sep 2014 21:18:11 +0000 (23:18 +0200)
committer	Federico Bruni <fedelogy@gmail.com>
	Mon, 29 Sep 2014 21:18:11 +0000 (23:18 +0200)