2 commits

Author	SHA1	Message	Date
Mark Pemberton	b628e63e01	Merge branch 'master' into privatekey2 ... Conflicts: data/templates/default/bookmarks.tpl.php	2011-06-04 00:38:07 -04:00
Christian Weiske	5ba53394fc	implement request #1989987: theme support. merge themes branch with --squash	2011-05-25 19:43:36 +02:00