Merge branch 'next'
authorPeter Korsgaard <peter@korsgaard.com>
Mon, 1 Sep 2014 13:22:07 +0000 (15:22 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 1 Sep 2014 13:22:07 +0000 (15:22 +0200)
commit5aedb8be688d47526101bdb3e58598df588326e6
treeae348b9262fdaf123b3b152e65b6116b5ef36cb4
parent7f0ce7c8780569afa33b68c9c024bf4072e29a99
parent62387a8b11224a9c5320d42e2f0c4e2089d3452b
Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/ffmpeg/ffmpeg.mk
package/gnupg2/gnupg2.mk
package/php/Config.ext
package/php/php.mk
package/postgresql/postgresql.mk
package/qt5/qt5base/Config.in
package/ruby/ruby.mk