Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

14 files changed, 0 insertions, 0 deletions

diff --git a/www/themes/default/images/b_edit.png b/www/themes/default/images/b_edit.png
new file mode 100644
index 0000000..05711a0
--- /dev/null
+++ b/www/themes/default/images/b_edit.png
diff --git a/www/themes/default/images/bg_admin.png b/www/themes/default/images/bg_admin.png
new file mode 100644
index 0000000..c707779
--- /dev/null
+++ b/www/themes/default/images/bg_admin.png
diff --git a/www/themes/default/images/bg_bar.png b/www/themes/default/images/bg_bar.png
new file mode 100644
index 0000000..7152ba1
--- /dev/null
+++ b/www/themes/default/images/bg_bar.png
diff --git a/www/themes/default/images/bg_header.png b/www/themes/default/images/bg_header.png
new file mode 100644
index 0000000..6fa4161
--- /dev/null
+++ b/www/themes/default/images/bg_header.png
diff --git a/www/themes/default/images/bg_sidebar.png b/www/themes/default/images/bg_sidebar.png
new file mode 100644
index 0000000..0edb153
--- /dev/null
+++ b/www/themes/default/images/bg_sidebar.png
diff --git a/www/themes/default/images/loading.gif b/www/themes/default/images/loading.gif
new file mode 100644
index 0000000..859126e
--- /dev/null
+++ b/www/themes/default/images/loading.gif
diff --git a/www/themes/default/images/logo.png b/www/themes/default/images/logo.png
new file mode 100644
index 0000000..4afe565
--- /dev/null
+++ b/www/themes/default/images/logo.png
diff --git a/www/themes/default/images/logo_24.gif b/www/themes/default/images/logo_24.gif
new file mode 100644
index 0000000..d5af64d
--- /dev/null
+++ b/www/themes/default/images/logo_24.gif
diff --git a/www/themes/default/images/rss.gif b/www/themes/default/images/rss.gif
new file mode 100644
index 0000000..094ba10
--- /dev/null
+++ b/www/themes/default/images/rss.gif
diff --git a/www/themes/default/images/thumbs_up.orig.png b/www/themes/default/images/thumbs_up.orig.png
new file mode 100644
index 0000000..1a89d0e
--- /dev/null
+++ b/www/themes/default/images/thumbs_up.orig.png
diff --git a/www/themes/default/images/vote-against-voted.png b/www/themes/default/images/vote-against-voted.png
new file mode 100644
index 0000000..740dfc8
--- /dev/null
+++ b/www/themes/default/images/vote-against-voted.png
diff --git a/www/themes/default/images/vote-against.png b/www/themes/default/images/vote-against.png
new file mode 100644
index 0000000..f15ea4d
--- /dev/null
+++ b/www/themes/default/images/vote-against.png
diff --git a/www/themes/default/images/vote-for-voted.png b/www/themes/default/images/vote-for-voted.png
new file mode 100644
index 0000000..5abd43e
--- /dev/null
+++ b/www/themes/default/images/vote-for-voted.png
diff --git a/www/themes/default/images/vote-for.png b/www/themes/default/images/vote-for.png
new file mode 100644
index 0000000..5973ae9
--- /dev/null
+++ b/www/themes/default/images/vote-for.png