use parcellite to keep various X clipboards in sync
Merge remote-tracking branch 'alon/master'
cronapt: only apply conf if cron-apt is installed
Merge remote-tracking branch 'liraz/master'
conf/tomcat: fixed JVM path under i386
Merge remote-tracking branch 'github/master'