Merge branch 'experimental' into cleaning-commenting

Conflicts:
	src/callbacks.c
	src/uzbl-core.c
	src/uzbl-core.h

1 files changed, 0 insertions, 1 deletions

diff --git a/src/util.h b/src/util.h
index a0efe85..388c202 100644
--- a/src/util.h
+++ b/src/util.h
@@ -17,5 +17,4 @@ gboolean    for_each_line_in_file(const gchar *path, void (*callback)(const gcha
 enum exp_type get_exp_type(const gchar*);
 gchar*      find_existing_file(gchar*);
 char*       itos(int val);
-gchar*      strfree(gchar *str);
 gchar*      argv_idx(const GArray*, const guint);