Merge branch 'release/2.20/master' into 'gentoo/2.20'
commit2511fe206c59793d25bf0e3e24a185545b3a93b6
authorMike Frysinger <vapier@gentoo.org>
Tue, 17 Feb 2015 07:30:01 +0000 (17 02:30 -0500)
committerMike Frysinger <vapier@gentoo.org>
Tue, 17 Feb 2015 07:30:01 +0000 (17 02:30 -0500)
tree1a46462f9b40a58c7cb7f9751d4db20df56668de
parent1b08ac828aeafeff86fa67108a8ad285d32f70e6
parent4d54424420c6300efbf57a7b9aa8635a8b8c1942
Merge branch 'release/2.20/master' into 'gentoo/2.20'