Merge branch 'master' into license-updates 182/head
authorIan Leonard <antonlacon@gmail.com>
Sun, 10 Aug 2014 08:09:06 +0000 (01:09 -0700)
committerIan Leonard <antonlacon@gmail.com>
Sun, 10 Aug 2014 08:09:06 +0000 (01:09 -0700)
commitf5a1d1bba66d293486dc74bbc1de767dc7054013
tree7685a0f8f7e195e22d93ab8ea8825a92d117e229
parentd55f37ea1a920beea420a50f4104a3d4109b095a
parent048e700bfc72247e425bd5ace12d90bbc39f8599
Merge branch 'master' into license-updates

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
Conflicts:
devel/patch/Makefile
multimedia/minidlna/Makefile
devel/patch/Makefile
multimedia/minidlna/Makefile
net/rsync/Makefile