new file:   ts/build/conf/rdesktop-tiny/build.conf.example
	new file:   ts/build/conf/rdesktop-tiny/thinstation.conf.buildtime
	modified:   ts/build/build
Merge remote-tracking branch 'upstream/master'
Fix for using a Font Server
	modified:   ts/build/build
	modified:   ts/build/packages/chrome/dependencies
	modified:   ts/build/packages/dillo/dependencies
	modified:   ts/build/packages/talkplugin/dependencies
	modified:   ts/build/packages/x-common/build/conf/55x-common
	modified:   ts/build/packages/xorg7/etc/init.d/xconf
	modified:   ts/build/packages/xorg7/etc/xserverrc
Add a version of gtkdialog that has vte support
	new file:   ts/ports/components/gtkdialog-vte/.footprint
	new file:   ts/ports/components/gtkdialog-vte/.md5sum
	new file:   ts/ports/components/gtkdialog-vte/Pkgfile
	new file:   ts/ports/components/gtkdialog-vte/gtkdialog-vte#0.8.3-2.pkg.tar.gz
	modified:   ts/build/build
	new file:   ts/build/packages/xfs-utils/.dna
	new file:   ts/build/packages/xfs-utils/build/install
	new file:   ts/build/packages/xfs-utils/build/remove
	new file:   ts/build/packages/xfs-utils/dependencies
	new file:   ts/unwind_cache/xfs-utils.turbo
	new file:   ts/wind_cache/xfs-utils.turbo
	new file:   usr/ports/xorg/xorg-fslsfonts/.footprint
	new file:   usr/ports/xorg/xorg-fslsfonts/.md5sum
	new file:   usr/ports/xorg/xorg-fslsfonts/Pkgfile
	new file:   usr/ports/xorg/xorg-fslsfonts/xorg-fslsfonts#1.0.4-1.pkg.tar.gz
	new file:   usr/ports/xorg/xorg-fstobdf/.footprint
	new file:   usr/ports/xorg/xorg-fstobdf/.md5sum
	new file:   usr/ports/xorg/xorg-fstobdf/Pkgfile
	new file:   usr/ports/xorg/xorg-fstobdf/xorg-fstobdf#1.0.5-1.pkg.tar.gz
	new file:   usr/ports/xorg/xorg-showfont/.footprint
	new file:   usr/ports/xorg/xorg-showfont/.md5sum
	new file:   usr/ports/xorg/xorg-showfont/Pkgfile
	new file:   usr/ports/xorg/xorg-showfont/xorg-showfont#1.0.4-1.pkg.tar.gz
	new file:   usr/ports/xorg/xorg-xfs/.footprint
	new file:   usr/ports/xorg/xorg-xfs/.md5sum
	new file:   usr/ports/xorg/xorg-xfs/Pkgfile
	new file:   usr/ports/xorg/xorg-xfs/xorg-xfs#1.1.4-1.pkg.tar.gz
	new file:   usr/ports/xorg/xorg-xfsinfo/.footprint
	new file:   usr/ports/xorg/xorg-xfsinfo/.md5sum
	new file:   usr/ports/xorg/xorg-xfsinfo/Pkgfile
	new file:   usr/ports/xorg/xorg-xfsinfo/xorg-xfsinfo#1.0.4-1.pkg.tar.gz
add fallback option for pxelinux.0
	modified:   ts/build/build
	modified:   ts/build/conf/x-common.conf.sample
	modified:   ts/build/build
	modified:   ts/build/build
	modified:   kernel-TS/ts.config
	modified:   kernel-TS_64/ts.config
	modified:   kernel-TS_SMP/ts.config
	modified:   ts/build/build
	modified:   ts/build/packages/xorg7/etc/xserverrc
	modified:   ts/ports/components/busybox-TS/ts.config
	modified:   ts/ports/kernel-modules/VERSION
	modified:   ts/ports/kernel-modules/aufs-patches/.md5sum
	deleted:    ts/ports/kernel-modules/aufs-patches/21.plus.patch
	modified:   ts/ports/kernel-modules/aufs-patches/Pkgfile
	deleted:    ts/ports/kernel-modules/aufs-patches/aufs-patches#3.14-1.pkg.tar.gz
	new file:   ts/ports/kernel-modules/aufs-patches/aufs-patches#3.14.21+-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/aufs/.footprint
	modified:   ts/ports/kernel-modules/aufs/.md5sum
	modified:   ts/ports/kernel-modules/aufs/Pkgfile
	new file:   ts/ports/kernel-modules/aufs/a.patch
	deleted:    ts/ports/kernel-modules/aufs/aufs#3.14-1.pkg.tar.gz
	new file:   ts/ports/kernel-modules/aufs/aufs#3.14.21+-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/bbswitch/.footprint
	modified:   ts/ports/kernel-modules/bbswitch/bbswitch#0.8-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/kernel-TS/.footprint
	modified:   ts/ports/kernel-modules/kernel-TS/.md5sum
	modified:   ts/ports/kernel-modules/kernel-TS/kernel-TS#1-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/kernel-TS/ts.config
	modified:   ts/ports/kernel-modules/kernel-TS_64/.footprint
	modified:   ts/ports/kernel-modules/kernel-TS_64/.md5sum
	new file:   ts/ports/kernel-modules/kernel-TS_64/.nostrip
	modified:   ts/ports/kernel-modules/kernel-TS_64/Pkgfile
	modified:   ts/ports/kernel-modules/kernel-TS_64/kernel-TS_64#1-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/kernel-TS_64/ts.config
	modified:   ts/ports/kernel-modules/kernel-TS_SMP/.footprint
	modified:   ts/ports/kernel-modules/kernel-TS_SMP/.md5sum
	modified:   ts/ports/kernel-modules/kernel-TS_SMP/kernel-TS_SMP#1-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/kernel-TS_SMP/ts.config
	modified:   ts/ports/kernel-modules/open-vm-tools/.footprint
	modified:   ts/ports/kernel-modules/open-vm-tools/Pkgfile
	modified:   ts/ports/kernel-modules/open-vm-tools/open-vm-tools#9.4.6-1770165-1.pkg.tar.gz
	modified:   ts/ports/kernel-modules/usb-redirector/.footprint
	modified:   ts/ports/kernel-modules/usb-redirector/usb-redirector#3.1-1.pkg.tar.gz
	modified:   ts/bin/gitignore
	modified:   ts/build/boot-images/.gitignore
	modified:   ts/build/packages/netfiles/etc/init.d/network_files
	modified:   ts/ports/components/ccid/.md5sum
	modified:   ts/ports/components/ccid/Pkgfile
	deleted:    ts/ports/components/ccid/ccid#1.4.17-1.pkg.tar.gz
	new file:   ts/ports/components/ccid/ccid#1.4.18-1.pkg.tar.gz
	modified:   ts/ports/components/pidgin-sipe/.md5sum
	modified:   ts/ports/components/pidgin-sipe/Pkgfile
	deleted:    ts/ports/components/pidgin-sipe/pidgin-sipe#1.14.1-1.pkg.tar.gz
	new file:   ts/ports/components/pidgin-sipe/pidgin-sipe#1.18.4-1.pkg.tar.gz
	modified:   ts/ports/components/pidgin/.footprint
	modified:   ts/ports/components/pidgin/.md5sum
	modified:   ts/ports/components/pidgin/Pkgfile
	new file:   ts/ports/components/pidgin/pidgin#2.10.10-1.pkg.tar.gz
	deleted:    ts/ports/components/pidgin/pidgin#2.10.9-1.pkg.tar.gz
	renamed:    ts/bin/eclean -> ts/bin/dclean
	modified:   ts/build/build.conf.example
	modified:   ts/build/conf/default/build.conf.example
	modified:   ts/build/conf/devstation/build.conf.example
	modified:   ts/build/packages/devstation/bin/devcmd
	modified:   ts/build/packages/geany/build/install
	modified:   ts/ports/components/filezilla/.footprint
	modified:   ts/ports/components/filezilla/.md5sum
	modified:   ts/ports/components/filezilla/Pkgfile
	deleted:    ts/ports/components/filezilla/filezilla#3.6.0.2-1.pkg.tar.gz
	new file:   ts/ports/components/filezilla/filezilla#3.7.4.1-1.pkg.tar.gz
	modified:   ts/ports/components/freerdp/.footprint
	modified:   ts/ports/components/freerdp/freerdp#1.2-master.pkg.tar.gz
	modified:   ts/ports/components/meld/.footprint
	modified:   ts/ports/components/meld/.md5sum
	modified:   ts/ports/components/meld/Pkgfile
	deleted:    ts/ports/components/meld/meld#1.6.1-1.pkg.tar.gz
	new file:   ts/ports/components/meld/meld#1.8.6-1.pkg.tar.gz
	new file:   ts/ports/extensions/enchant/.footprint
	new file:   ts/ports/extensions/enchant/.md5sum
	new file:   ts/ports/extensions/enchant/Pkgfile
	new file:   ts/ports/extensions/enchant/enchant#1.6.0-2.pkg.tar.gz
	new file:   ts/ports/extensions/geany-plugins/.footprint
	new file:   ts/ports/extensions/geany-plugins/.md5sum
	new file:   ts/ports/extensions/geany-plugins/Pkgfile
	new file:   ts/ports/extensions/geany-plugins/geany-plugins#git-1.pkg.tar.gz
	modified:   ts/ports/extensions/geany/.footprint
	modified:   ts/ports/extensions/geany/.md5sum
	modified:   ts/ports/extensions/geany/Pkgfile
	deleted:    ts/ports/extensions/geany/geany#1.22-1.pkg.tar.gz
	new file:   ts/ports/extensions/geany/geany#1.24.1-1.pkg.tar.gz
	new file:   ts/ports/extensions/gpgme/.footprint
	new file:   ts/ports/extensions/gpgme/.md5sum
	new file:   ts/ports/extensions/gpgme/Pkgfile
	new file:   ts/ports/extensions/gpgme/gpgme#1.3.2-1.pkg.tar.gz
	new file:   ts/ports/extensions/gtkspell/.footprint
	new file:   ts/ports/extensions/gtkspell/.md5sum
	new file:   ts/ports/extensions/gtkspell/Pkgfile
	new file:   ts/ports/extensions/gtkspell/gtkspell#2.0.16-1.pkg.tar.gz
	new file:   ts/ports/extensions/spell-en_us/.md5sum
	new file:   ts/ports/extensions/spell-en_us/Pkgfile
	modified:   ts/ports/gnome/medit/.footprint
	modified:   ts/ports/gnome/medit/.md5sum
	modified:   ts/ports/gnome/medit/Pkgfile
	deleted:    ts/ports/gnome/medit/medit#1.1.1-1.pkg.tar.gz
	new file:   ts/ports/gnome/medit/medit#1.2.0-1.pkg.tar.gz
	new file:   usr/ports/opt/libassuan/.footprint
	new file:   usr/ports/opt/libassuan/.md5sum
	new file:   usr/ports/opt/libassuan/Pkgfile
	new file:   usr/ports/opt/libassuan/libassuan#2.1.3-1.pkg.tar.gz
	new file:   ts/ports/extensions/spell-en_us/.footprint
	modified:   ts/ports/extensions/spell-en_us/Pkgfile
	new file:   ts/ports/extensions/spell-en_us/spell-en_us#1.1.2-1.pkg.tar.gz
Merge branch 'master' into 5.3-Stable
	modified:   README.md
	modified:   README.md
Merge remote-tracking branch 'upstream/master'