Merge branch 'master' of ../current
authorJames Buren <ryuo@frugalware.org>
Thu, 20 Feb 2014 23:22:39 +0000 (17:22 -0600)
committerJames Buren <ryuo@frugalware.org>
Thu, 20 Feb 2014 23:22:39 +0000 (17:22 -0600)
commite0c4a3888f41c64bb3e4868034e96fae37946846
tree7b7fd5e0235bafb941ac35fa0f6a07d4036ade78
parentde1ea55a5ff99f00ffad4447e41dfab60cba50fd
parent76f81bfba2e3d56d311005e393a5c5b738b614d1
Merge branch 'master' of ../current