r22689 - htdocs/branches/beta - Merge branch 'trunk' into beta

[John Ralls]

Author: jralls
Date: 2013-01-10 18:39:10 -0500 (Thu, 10 Jan 2013)
New Revision: 22689
Trac: http://svn.gnucash.org/trac/changeset/22689

Added:
   htdocs/branches/beta/docs/v1.6/de_DE/image
   htdocs/branches/beta/docs/v1.6/es/image
   htdocs/branches/beta/docs/v1.6/pt_PT/image
Modified:
   htdocs/branches/beta/.htaccess
   htdocs/branches/beta/robots.txt
Log:
Merge branch 'trunk' into beta