Wed, 30 May 2012 13:08:16 +0200 cavaliet Enhance pagination with public project and quick search.
Fri, 25 May 2012 17:50:54 +0200 cavaliet Merge with 87aa076dabd660637a3127d7b8878922b1a63373
Fri, 25 May 2012 17:47:20 +0200 cavaliet First step of pagination for contents and projet in workspace home.
Fri, 25 May 2012 16:40:26 +0200 ymh Added tag V01.09 for changeset b419e891b0bd
Fri, 25 May 2012 16:40:12 +0200 ymh correct virtualenv install + sync files V01.09
Fri, 25 May 2012 16:33:16 +0200 ymh add missing icons + correct virtualenv creation
Fri, 25 May 2012 12:55:52 +0200 ymh Added tag V01.08 for changeset 14fe3554ad26
Fri, 25 May 2012 12:54:31 +0200 ymh update django V01.08
Thu, 24 May 2012 17:55:54 +0200 ymh Added tag V01.08 for changeset dd483c59340c
Thu, 24 May 2012 17:46:42 +0200 ymh recorrect version, already updated
Thu, 24 May 2012 17:44:43 +0200 ymh bump versions
Thu, 24 May 2012 15:46:38 +0200 ymh Merge with 49e6b1148a7abf83b79ac21a392af284b607bbb4
Fri, 11 May 2012 14:47:11 +0200 ymh add resource for mercurial for sync scripts
Fri, 11 May 2012 14:45:44 +0200 ymh Merge with 9420412046a3c59426256776b1ab7f7098fe72a0
Thu, 10 May 2012 12:14:34 +0200 ymh new sync script using fabric
Thu, 10 May 2012 09:51:59 +0200 ymh Removed tag V01.08
Wed, 09 May 2012 19:29:34 +0200 ymh Added tag V01.08 for changeset 04c71ec19b80
Wed, 09 May 2012 19:28:51 +0200 ymh debug setup
Thu, 03 May 2012 18:30:04 +0200 ymh correct initialization.
Thu, 03 May 2012 17:07:41 +0200 ymh temporary commit to test build script
Mon, 30 Apr 2012 16:41:39 +0200 ymh correct translation. + new version
Thu, 24 May 2012 16:04:20 +0200 cavaliet Added tag V00.21.2 for changeset 2252fb64f74e maintenance_0.21
Thu, 24 May 2012 16:04:07 +0200 cavaliet update ldt for maintenance 00.21.2 maintenance_0.21 V00.21.2
Thu, 24 May 2012 16:01:52 +0200 cavaliet Added tag V00.21.1 for changeset bb21a4023620 maintenance_0.21
Thu, 24 May 2012 16:01:19 +0200 cavaliet update ldt for maintenance 00.21 maintenance_0.21 V00.21.1
Wed, 23 May 2012 17:32:08 +0200 cavaliet update ldt.swf
Thu, 03 May 2012 12:39:07 +0200 cavaliet Merge with be146024440c6d1bd382a4f63020e0d0165b9fca
Thu, 03 May 2012 12:37:16 +0200 cavaliet hide/show slideshare in front.
Fri, 27 Apr 2012 17:18:32 +0200 ymh Added tag V01.07 for changeset 81cbac0d6d8c
Fri, 27 Apr 2012 17:18:00 +0200 ymh update version to 1.07 V01.07
Fri, 27 Apr 2012 12:36:30 +0200 ymh Added tag V01.07 for changeset 006f1e3e5398
Fri, 27 Apr 2012 12:34:57 +0200 ymh clean packages
Fri, 27 Apr 2012 12:07:28 +0200 cavaliet Update SlideShareWidget with buttons down the slides. Synchro can be disabled/enabled.
Thu, 26 Apr 2012 12:10:28 +0200 cavaliet SlideShareWidget better management of container.
Tue, 24 Apr 2012 12:20:04 +0200 cavaliet update MDP with SlideShareWidget and the new private embed.
Thu, 19 Apr 2012 18:16:33 +0200 cavaliet minor clean in embed template.
Thu, 19 Apr 2012 17:03:56 +0200 cavaliet Enhance SlideShare widget for it to point the a specified div. Clean url template for some api calls.
Wed, 18 Apr 2012 15:29:06 +0200 cavaliet Asd slide share widget to the embed player
Mon, 02 Apr 2012 13:43:04 +0200 cavaliet new version of ldt.swf and language files updated.
Fri, 30 Mar 2012 17:59:17 +0200 veltr updated Metadataplayer
Tue, 13 Mar 2012 13:00:53 +0100 cavaliet Wording for front and french translations updated. (2d)
Tue, 13 Mar 2012 12:56:12 +0100 cavaliet Wording for front and french translations updated.
Thu, 08 Mar 2012 23:53:40 +0100 ymh Added tag V01.06 for changeset 37c81c68ccf6
Thu, 08 Mar 2012 23:53:22 +0100 ymh new version V01.06
Thu, 08 Mar 2012 18:16:14 +0100 cavaliet Enable search by author.
Wed, 07 Mar 2012 12:47:42 +0100 cavaliet merge indexation for possibility to search by group of tagged medias.
Wed, 07 Mar 2012 12:44:22 +0100 cavaliet Merge with d2e8ae250f6ca7460ed8f055e95a2531cb8bc6dc
Wed, 07 Mar 2012 12:43:58 +0100 cavaliet possibility to search by group of tagged medias.
Tue, 06 Mar 2012 13:20:22 +0100 cavaliet debug js for search form.
Tue, 06 Mar 2012 18:42:07 +0100 ymh Added tag V01.05 for changeset d7c1c1f04694
Tue, 06 Mar 2012 18:41:55 +0100 ymh new version V01.05
Tue, 06 Mar 2012 18:37:36 +0100 ymh Added tag V01.05 for changeset bc018d2744f2
Tue, 06 Mar 2012 18:37:21 +0100 ymh release indexer
Tue, 06 Mar 2012 00:11:43 +0100 ymh Added tag V01.04 for changeset 4f99c1aeba7c
Tue, 06 Mar 2012 00:11:27 +0100 ymh preserve crossdomain.xml file V01.04
Mon, 05 Mar 2012 23:51:57 +0100 ymh Added tag V01.04 for changeset faf94ed5367b
Mon, 05 Mar 2012 23:51:43 +0100 ymh new version
Mon, 05 Mar 2012 23:45:26 +0100 ymh template cleaning, translation in js, and add generic google analytics
Sun, 04 Mar 2012 04:30:43 +0100 ymh preserve virtualenvs
Sun, 04 Mar 2012 04:14:55 +0100 ymh Added tag V01.03 for changeset 9606d6acba7e
Sun, 04 Mar 2012 04:14:43 +0100 ymh remane wsgi module V01.03
Sun, 04 Mar 2012 01:53:27 +0100 ymh Added tag V01.03 for changeset 8f76d59406fe
Sun, 04 Mar 2012 01:53:15 +0100 ymh add uwsgi bootstrap file
Fri, 02 Mar 2012 17:24:58 +0100 ymh Added tag V01.03 for changeset f8a54d88b49a
Fri, 02 Mar 2012 17:24:35 +0100 ymh correct virtualenv script creation script
Thu, 01 Mar 2012 13:44:07 +0100 ymh Added tag V01.03 for changeset 4e79c564166d
Thu, 01 Mar 2012 13:43:55 +0100 ymh correct sync
Thu, 01 Mar 2012 13:18:57 +0100 ymh Added tag V01.03 for changeset c01075236079
Thu, 01 Mar 2012 13:17:55 +0100 ymh new version and new location for the platform
Tue, 21 Feb 2012 12:13:11 +0100 cavaliet merge and commit small css change.
Fri, 17 Feb 2012 16:51:38 +0100 hamidouk slight change regarding some paths included.
Fri, 17 Feb 2012 11:59:24 +0100 hamidouk Merge with upstream
Fri, 17 Feb 2012 11:59:02 +0100 hamidouk new player version.
Fri, 17 Feb 2012 11:49:29 +0100 verrierj Segment API returns 404 error instead of 500 when content is not found
Fri, 17 Feb 2012 10:32:06 +0100 verrierj Replace href by url in JSON
Fri, 17 Feb 2012 10:23:44 +0100 verrierj Merge with fe5289a8d8290a85e20f8623ecd2b620baf77866
Wed, 15 Feb 2012 14:52:39 +0100 verrierj Little clean up for search
Mon, 13 Feb 2012 21:53:36 +0100 ymh Added tag V01.02 for changeset b67fc0fd2389
Mon, 13 Feb 2012 21:53:24 +0100 ymh small correction on indexation + version bum V01.02
Mon, 13 Feb 2012 18:04:28 +0100 cavaliet correct search function. change two default tags in embed player.
Mon, 13 Feb 2012 16:17:25 +0100 ymh Added tag V01.01 for changeset ea8c12f58302
Mon, 13 Feb 2012 16:17:09 +0100 ymh bump version V01.01
Mon, 13 Feb 2012 15:50:26 +0100 verrierj Merge with 9e4b8f69f062d79d5c252b29bb478ba93ad39171
Mon, 13 Feb 2012 15:47:26 +0100 verrierj Remove cache from search results
Mon, 13 Feb 2012 12:12:04 +0100 verrierj Fix bug in search results front page
Mon, 13 Feb 2012 12:47:07 +0100 ymh delete dead code
Mon, 13 Feb 2012 12:45:04 +0100 ymh correct annoations api handler + ldt encoding
Fri, 10 Feb 2012 17:07:35 +0100 ymh Added tag V01.00 for changeset 0696566c7dc4
Fri, 10 Feb 2012 17:07:18 +0100 ymh upgrade django V01.00
Fri, 10 Feb 2012 16:52:14 +0100 ymh Added tag V01.00 for changeset 1c589f1393c8
Fri, 10 Feb 2012 16:52:03 +0100 ymh correct irtual env creation SORL_THUMBNAIL
Fri, 10 Feb 2012 09:02:18 +0100 ymh Added tag V01.00 for changeset 765e7c443ebe
Fri, 10 Feb 2012 09:01:42 +0100 ymh new version
Fri, 10 Feb 2012 08:57:48 +0100 ymh commit query
Fri, 10 Feb 2012 01:05:32 +0100 ymh put external stream in settings
Thu, 09 Feb 2012 22:17:34 +0100 ymh change stat_annotation to one to one field
Thu, 09 Feb 2012 15:14:23 +0100 verrierj Merge with f051a2432970e5bbda2fcff5625d4c22d9b56368
Thu, 09 Feb 2012 15:13:32 +0100 verrierj Minor bugs about permission caching
Thu, 09 Feb 2012 15:10:05 +0100 hamidouk new version, new css.
Thu, 09 Feb 2012 12:09:37 +0100 hamidouk Merge with upstream
Thu, 09 Feb 2012 12:09:14 +0100 hamidouk new player version.
Thu, 09 Feb 2012 11:48:48 +0100 verrierj Fix minor bug at user creation
Thu, 09 Feb 2012 10:17:59 +0100 verrierj Fix bug in content edition form
Wed, 08 Feb 2012 17:36:59 +0100 cavaliet enable dailymotion embed player.
Wed, 08 Feb 2012 14:00:15 +0100 ymh export stat to extarnal object. does not fully work
Wed, 08 Feb 2012 11:46:49 +0100 hamidouk Merge with upstream
Wed, 08 Feb 2012 11:46:17 +0100 hamidouk new player version with support for dailymotion.
Mon, 06 Feb 2012 16:36:23 +0100 ymh Merge with 8589160ac9e3196bf12d2093e469b512b6f86083
Mon, 06 Feb 2012 15:02:21 +0100 ymh put syntax in config file
Mon, 06 Feb 2012 16:03:56 +0100 hamidouk Merge with upstream
Mon, 06 Feb 2012 16:03:30 +0100 hamidouk bug fixes. enabled tags.
Mon, 06 Feb 2012 15:17:25 +0100 cavaliet Little correction on content tag management.
Mon, 06 Feb 2012 15:03:43 +0100 verrierj Fix stat form in admin
Mon, 06 Feb 2012 13:18:01 +0100 verrierj Merge with 7bb62216b289599c8bf25e56fc066a435e2ec421
Mon, 06 Feb 2012 12:42:53 +0100 verrierj Projectserializer can add an extra annotation-type and its annotations to the serialization of a view
Mon, 06 Feb 2012 12:09:38 +0100 cavaliet Merge with d2c99cb0318702424690dd9239b22af5b5216ba5
Mon, 06 Feb 2012 12:08:21 +0100 cavaliet Little correction on content tag management.
Mon, 06 Feb 2012 11:52:17 +0100 hamidouk Merge with upstream.
Mon, 06 Feb 2012 11:51:56 +0100 hamidouk new player version. fixes annotation creation bug.
Mon, 06 Feb 2012 10:35:48 +0100 cavaliet Little correction on content tag management.
Fri, 03 Feb 2012 17:20:50 +0100 hamidouk Merge with upstream
Fri, 03 Feb 2012 17:20:18 +0100 hamidouk new player version
Fri, 03 Feb 2012 16:18:43 +0100 verrierj Link to projects is displayed for logged users only
Fri, 03 Feb 2012 16:02:04 +0100 hamidouk new player version
Fri, 03 Feb 2012 12:13:24 +0100 verrierj Remove "clic ici" link from login page
Fri, 03 Feb 2012 12:09:54 +0100 verrierj Fix bug when adding first annotation
Fri, 03 Feb 2012 11:50:52 +0100 veltr Sparkline correction
Fri, 03 Feb 2012 10:22:32 +0100 hamidouk Merge with upstream
Fri, 03 Feb 2012 10:22:11 +0100 hamidouk updated player version. disabled minified player.
Thu, 02 Feb 2012 18:29:44 +0100 verrierj Medias with no annotations are not displayed on front home page
Thu, 02 Feb 2012 17:43:40 +0100 verrierj Merge with 8fb2523b9c74b1d926a1df9f575fbb82cf315a49
Thu, 02 Feb 2012 17:39:54 +0100 verrierj Fix bugs in permissions
Thu, 02 Feb 2012 17:00:28 +0100 veltr Correction CSS
Thu, 02 Feb 2012 16:12:46 +0100 hamidouk Merge with upstream
Thu, 02 Feb 2012 16:12:17 +0100 hamidouk enabled the minified version of the ldtplayer.
Thu, 02 Feb 2012 16:10:55 +0100 verrierj Fix bugs in forms
Thu, 02 Feb 2012 15:44:35 +0100 verrierj Commands display progress bars
Thu, 02 Feb 2012 15:35:47 +0100 hamidouk Merge with upstream
Thu, 02 Feb 2012 15:35:19 +0100 hamidouk new player version. new css.
Thu, 02 Feb 2012 15:30:15 +0100 verrierj Merge with d6371bde0c13b36b44c186d40f78ae4355f94c85
Thu, 02 Feb 2012 15:24:08 +0100 verrierj User image is sent to metadataplayer
Thu, 02 Feb 2012 15:16:24 +0100 verrierj Fix bugs in content creation form
Thu, 02 Feb 2012 14:14:06 +0100 verrierj Users arrive in front pages by default + bugfixes
Thu, 02 Feb 2012 12:48:30 +0100 verrierj Contents objects are not public by default
Thu, 02 Feb 2012 12:39:13 +0100 ymh Merge with 10ec59f061981e71e3118c21e0f9f4455b12288c
Thu, 02 Feb 2012 12:36:05 +0100 ymh small change after old platform migration
Thu, 02 Feb 2012 11:07:20 +0100 hamidouk Merge with upstream
Thu, 02 Feb 2012 11:06:49 +0100 hamidouk new player version.
Wed, 01 Feb 2012 15:29:34 +0100 verrierj Stats are updated correctly when a project is unpublished
Wed, 01 Feb 2012 14:34:43 +0100 hamidouk Merge with upstream.
Wed, 01 Feb 2012 14:34:12 +0100 hamidouk workarounds a jwplayer bug.
Wed, 01 Feb 2012 11:53:41 +0100 verrierj Search results with the same segment.element_id are displayed correctly
Tue, 31 Jan 2012 16:02:39 +0100 hamidouk Merge with upstream
Tue, 31 Jan 2012 16:02:03 +0100 hamidouk new player version.
Tue, 31 Jan 2012 15:41:01 +0100 verrierj Merge with 501c005917394468865fbffcabba428baf31b781
Tue, 31 Jan 2012 15:40:42 +0100 verrierj View annot_content always finds a project
Tue, 31 Jan 2012 15:38:07 +0100 hamidouk Merge with upstream
Tue, 31 Jan 2012 15:37:35 +0100 hamidouk new player version. fixes some bugs too!
Tue, 31 Jan 2012 14:38:21 +0100 verrierj Bugfixes in search page + update settings metadataplayer
Tue, 31 Jan 2012 12:46:00 +0100 hamidouk fixed seeking for player.
Tue, 31 Jan 2012 11:41:52 +0100 hamidouk new version of the annotationListWidget which gets its data from a different url.
Mon, 30 Jan 2012 17:21:13 +0100 verrierj Add setting to metadataplayer for API url
Mon, 30 Jan 2012 16:46:50 +0100 hamidouk Merge with upstream.
Mon, 30 Jan 2012 16:46:14 +0100 hamidouk new player version with a different configuration.
Mon, 30 Jan 2012 15:55:54 +0100 verrierj Lot of bugfixes
Mon, 30 Jan 2012 11:14:08 +0100 verrierj Polemic syntax can be used in API
Fri, 27 Jan 2012 17:21:56 +0100 verrierj Minor bugs
Fri, 27 Jan 2012 16:27:47 +0100 verrierj Objects serializer send correct stats
Fri, 27 Jan 2012 16:16:54 +0100 verrierj Fix bug when annotations are added in the metadataplayer
Fri, 27 Jan 2012 15:57:14 +0100 veltr Minor corrections
Fri, 27 Jan 2012 15:49:21 +0100 veltr Hide sparkline if no annotations
Fri, 27 Jan 2012 15:40:10 +0100 veltr Correction proportions annotations
Fri, 27 Jan 2012 15:26:57 +0100 verrierj Fix bug in regenerating stat command
Fri, 27 Jan 2012 15:18:36 +0100 veltr Merge with Jacques last revision
Fri, 27 Jan 2012 15:04:59 +0100 veltr Annotations have a min. width
Fri, 27 Jan 2012 14:56:11 +0100 verrierj Merge with 4e8c6e580e78179f27cd14d17b0fccf0dab24d5f
Fri, 27 Jan 2012 14:39:39 +0100 verrierj add all polemic attributes and polemic attribute rates on contents
Fri, 27 Jan 2012 11:26:48 +0100 verrierj Fix bug in search results for nan-admin users
Fri, 27 Jan 2012 10:27:52 +0100 verrierj Add polemic properties to contents
Thu, 26 Jan 2012 16:01:12 +0100 verrierj Removed object AnnotationStat + stats are computed when projects are published/unpublished
Fri, 27 Jan 2012 14:37:10 +0100 veltr Minor corrections for FF3.6
Fri, 27 Jan 2012 11:55:14 +0100 hamidouk cleaned up the templates and css for the player.
Fri, 27 Jan 2012 11:54:54 +0100 hamidouk new player version.
Fri, 27 Jan 2012 11:28:34 +0100 hamidouk the div containing the AnnotationsListWidget has now the size of the widget.
Thu, 26 Jan 2012 17:27:27 +0100 hamidouk Merge with upstream
Thu, 26 Jan 2012 17:23:18 +0100 hamidouk updated the player version.
Thu, 26 Jan 2012 15:04:38 +0100 verrierj Merge with 8447baa233e6c23bd48a4d90869bdf860f0eacae
Thu, 26 Jan 2012 15:02:47 +0100 verrierj Fix bug in migration
Thu, 26 Jan 2012 12:09:21 +0100 verrierj Little cleanup for migrations
Thu, 26 Jan 2012 12:22:17 +0100 veltr CSS Correction
Thu, 26 Jan 2012 12:17:53 +0100 veltr Added polemic volumes to all medias
Thu, 26 Jan 2012 11:36:20 +0100 veltr Preview on search results follows scrolling
Wed, 25 Jan 2012 19:20:55 +0100 veltr Ajout du preview des resultats de recherche
Wed, 25 Jan 2012 17:59:42 +0100 verrierj Merge with 29f990eb014488f105d54164324c7faa4a271119
Wed, 25 Jan 2012 17:57:01 +0100 verrierj segment abstracts + content images can be retrieved directly from search results page
Wed, 25 Jan 2012 15:47:19 +0100 verrierj Add permalinks to LDT
Wed, 25 Jan 2012 17:55:21 +0100 veltr Added color bars on 'most annotated media'
Wed, 25 Jan 2012 14:58:21 +0100 veltr Merge
Wed, 25 Jan 2012 14:40:10 +0100 veltr Saving minor changes
Wed, 25 Jan 2012 16:55:04 +0100 cavaliet Update front tag list management with virtual SETTINGS and djblets.siteconfig. siteconfig
Wed, 25 Jan 2012 14:50:22 +0100 verrierj Add cutting_id to search results
Wed, 25 Jan 2012 14:25:53 +0100 verrierj view annotation_preview returns a true annotation serialized in JSON
Wed, 25 Jan 2012 12:31:55 +0100 cavaliet Update front tag list management with settings/config.
Tue, 24 Jan 2012 16:03:14 +0100 cavaliet Prepare url, front.py, js and template to load annotation preview.
Tue, 24 Jan 2012 14:55:05 +0100 veltr Merge
Tue, 24 Jan 2012 14:53:27 +0100 veltr Merge
Tue, 24 Jan 2012 14:52:50 +0100 veltr Corrections highlight search results
Tue, 24 Jan 2012 14:54:11 +0100 cavaliet ldt.swf new parameters in template.
Tue, 24 Jan 2012 14:46:14 +0100 cavaliet Merge with da40a1d68999a27aad7224dd8ad5caf33d4e15b7
Tue, 24 Jan 2012 14:45:40 +0100 cavaliet New ldt.swf who can display two permalinks per annotation/segment.
Tue, 24 Jan 2012 14:44:24 +0100 cavaliet New ldt.swf who can display two permalinks per annotation/segment.
Tue, 24 Jan 2012 14:09:28 +0100 veltr Added a color palette to search results
Tue, 24 Jan 2012 12:20:39 +0100 veltr Correction couleur recherche
Tue, 24 Jan 2012 10:25:44 +0100 hamidouk Merge with upstream.
Tue, 24 Jan 2012 10:25:28 +0100 hamidouk updated player version.
Mon, 23 Jan 2012 16:54:16 +0100 hamidouk Merge with upstream.
Mon, 23 Jan 2012 16:53:54 +0100 hamidouk updated player version.
Mon, 23 Jan 2012 19:05:21 +0100 cavaliet litlle css correction on search result.
Mon, 23 Jan 2012 17:07:23 +0100 verrierj Merge with 870f880fb340a38d23a934cb1d1df3fcdc865260
Fri, 20 Jan 2012 17:57:42 +0100 verrierj Fix pluralized translations + clean-up segmentserializer
Fri, 20 Jan 2012 15:36:37 +0100 verrierj refactor modal windows + add translations
Fri, 20 Jan 2012 10:26:58 +0100 verrierj Add more translations
Thu, 19 Jan 2012 16:46:06 +0100 verrierj Add french translations + small bugfixes
Mon, 23 Jan 2012 16:37:23 +0100 veltr Les Web Fonts sont en local sur la plateforme
Mon, 23 Jan 2012 16:09:42 +0100 veltr CSS corrections
Thu, 19 Jan 2012 10:48:06 +0100 verrierj Merge with dc8a7dc00a21351a401060cef616dc075a71ed33
Wed, 18 Jan 2012 17:36:10 +0100 verrierj Small bugfixes
Wed, 18 Jan 2012 17:51:01 +0100 cavaliet Update search result for "id" in annotation link.
Wed, 18 Jan 2012 16:42:52 +0100 hamidouk Merge with upstream
Wed, 18 Jan 2012 16:42:28 +0100 hamidouk updated player version.
Wed, 18 Jan 2012 16:31:01 +0100 verrierj Merge with 6fb6d534009af9d72c5eb1ffc41f9656cc8866ac
Wed, 18 Jan 2012 16:29:02 +0100 verrierj Annotation-types title are found in search API
Wed, 18 Jan 2012 15:36:26 +0100 hamidouk Merging with upstream
Wed, 18 Jan 2012 15:36:03 +0100 hamidouk updated player version. jquery ui update fixes elusive focus() bug.
Wed, 18 Jan 2012 15:30:35 +0100 verrierj Add API to search annotations inside a content between two timecodes
Wed, 18 Jan 2012 10:53:49 +0100 verrierj Small bugfixes
Wed, 18 Jan 2012 10:52:51 +0100 verrierj Fix bug when saving content whith front_project
Tue, 17 Jan 2012 17:53:21 +0100 cavaliet First step of tag management for contents.
Tue, 17 Jan 2012 16:30:40 +0100 hamidouk Merge with upstream
Tue, 17 Jan 2012 16:30:06 +0100 hamidouk a whole lotta bugfixes.
(0) -240 +240 tip