Michael Vogel 95e6e5efd5 Merge remote branch 'upstream/master' ...

Conflicts:
	libertree/libertree.php

2012-07-13 23:47:21 +02:00

..

libertree.css

plugin connector settings page cleanup

2012-06-06 22:27:35 -07:00

libertree.php

Merge remote branch 'upstream/master'

2012-07-13 23:47:21 +02:00