denise
9a9add9732
SAAS-235: Metrics: "Trial End Date" should be sent to stat server (only for SaaS customers)
...
-done
2012-05-07 15:07:29 -04:00
Martin Konecny
1d245ed79d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:26:00 -04:00
Martin Konecny
c466b946a0
CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
...
-change read permissions on files right after they're uploaded
2012-05-07 13:12:20 -04:00
Naomi Aro
abd63e736a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 18:19:26 +02:00
Naomi Aro
a514e3b60a
CC-3776 : Current Recorded show is resizeable on the calendar (by dragging)
2012-05-07 18:19:18 +02:00
denise
bdf314b93a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
- put DB query inside try-catch
2012-05-07 12:12:08 -04:00
denise
3a6a1d8691
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 12:02:15 -04:00
denise
96fa5ac715
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-added soundclound_enabled check
2012-05-07 12:01:36 -04:00
Naomi Aro
6a93a479f8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 17:49:35 +02:00
Naomi Aro
df4cdfb07e
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 17:48:56 +02:00
denise
678e573e7a
SAAS-157: Automated metrics: gather info about soundcloud usage
...
-done
2012-05-07 11:24:40 -04:00
denise
b5db91f0f4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 10:22:41 -04:00
Naomi Aro
a79514c8ee
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 15:24:06 +02:00
Naomi Aro
41e7150462
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-07 14:29:02 +02:00
Naomi Aro
a4b949cc2f
CC-3753 : Cannot cancel record show on Timeline view
2012-05-07 14:28:21 +02:00
Martin Konecny
bd6686a243
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
...
fixed
2012-05-06 20:45:52 -04:00
Martin Konecny
6135660d0f
CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
2012-05-06 20:05:14 -04:00
Martin Konecny
4ad3286db2
CC-3769: PHP 5.3.2 issue with DateTime::createFromFormat and format string "U.u"
2012-05-06 15:34:41 -04:00
Martin Konecny
1f214747b2
-catch all exceptions in Preference model and make header 503
2012-05-05 22:29:16 -04:00
denise
7c06e27e7f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 15:58:14 -04:00
denise
f50d7c3c03
SAAS-157:Automated metrics: gather info about soundcloud usage
...
-added soundcloud_enabled option
2012-05-04 15:58:07 -04:00
Martin Konecny
9092b7f725
CC-3764: Media Library->Edit Metadata: Throw exception when trying to edit metadata
...
-fixed
2012-05-04 12:47:29 -04:00
Martin Konecny
22c5da1629
CC-3755: Found Exception in apache's error log
...
-Return error code so that python services automatically retry later.
2012-05-04 12:40:44 -04:00
Martin Konecny
b4cd429204
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-04 12:06:41 -04:00
Martin Konecny
65e771d189
CC-3756: Cannot download/preview tracks in Media Library
...
-Fixed
2012-05-04 12:02:42 -04:00
Naomi Aro
d19ed4a97e
CC-3730 : Boundary tracks need recalculating when resizing current show on calendar (by dragging)
2012-05-04 17:49:58 +02:00
denise
13e147540d
SAAS-214: "--email" being inserted for "city" field in statistics
...
-fixed quote insertion if string is empty
2012-05-03 13:55:55 -04:00
denise
ff6e2a2e5a
CC-3747: Metadata popup should also show the filepath of the track
...
-fixed
2012-05-02 16:52:49 -04:00
denise
0c337fe430
CC-3747: Metadata popup should also show the filepath of the track
...
-done
2012-05-01 12:39:56 -04:00
denise
4477ac02e7
CC-3677: Tooltips improvements
...
-done
2012-04-30 16:20:23 -04:00
James
0d5f581e35
CC-3731: Can add a show of zero length
...
- fixed
- extra fix: Changed all the duration format so it's consistent
2012-04-27 14:07:14 -04:00
Naomi Aro
2c84420424
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-26 12:15:31 +02:00
Naomi Aro
b5863d3d7a
CC-3522 : Now Playing Screen-> Periodical message pops up
2012-04-26 12:14:41 +02:00
Martin Konecny
34a1949511
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-25 15:09:58 -04:00
Naomi Aro
d2448b804f
CC-3697 : Only "Recording From Line In" can be added to the Rebroadcast show
2012-04-25 17:09:40 +02:00
Naomi Aro
b6bed6ce7a
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 15:22:38 +02:00
Naomi Aro
7aeddf5bb0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-25 12:51:00 +02:00
Naomi Aro
4cdfd33044
CC-3667 : Preferences pages should have an option to enable/disable password recovery option
2012-04-25 11:32:43 +02:00
Martin Konecny
63a5f45e9b
CC-3690: Able to create repeat show in the past, by editing an already ON AIR show
...
-fixed
2012-04-24 18:22:39 -04:00
Martin Konecny
3bc919affb
CC-3696: more rebroadcast show instances will be created after change the calendar
...
-fixed
2012-04-24 17:52:07 -04:00
Martin Konecny
dd72090c3f
CC-3711: Verify Propel hasn't broken anything with its different handling of boolean columns compared to Pear.
...
-fixed in ShowBuilder controller
2012-04-24 16:46:51 -04:00
Martin Konecny
6e755b000b
CC-3707: copy files to stor, extra forwardslash
...
-fixed
2012-04-24 16:15:22 -04:00
James
3c4d01aa93
CC-3675: Playlist -> the files from Disconnected Mediafolder can still
...
be previewed (played)
- done
2012-04-24 12:59:07 -04:00
Martin Konecny
b9ab11ce28
CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor
...
-fixed
2012-04-23 17:18:34 -04:00
Martin Konecny
5e5ced6fe5
CC-3701: Need to differentiate between a service being down vs not-monitored (airtime-check-system)
...
-fixed
2012-04-22 14:28:02 -04:00
Martin Konecny
5aa2339a1d
CC-3693: Uninstalling + Reinstall of Airtime + refreshing the page as a non-existant user causes a stack trace.
...
-Fixed
2012-04-20 13:11:28 -04:00
Martin Konecny
7d6e251adf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-20 11:31:37 -04:00
Martin Konecny
da8a5296b0
CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
...
-add user type into javascript as a variable so we can check permissions on js side
2012-04-20 11:31:24 -04:00
Naomi Aro
d5a416be43
CC-3416 : Create password reset form
2012-04-20 16:10:27 +02:00
Naomi Aro
e242972a78
Merge branch 'CC-3174' into devel
2012-04-20 13:04:38 +02:00
Naomi Aro
6b4fd7d3bb
CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline
2012-04-20 13:03:50 +02:00
Martin Konecny
16f3a331bb
CC-1927: Remove PEAR DB
...
-missed some conflicts :/
2012-04-19 17:03:13 -04:00
Martin Konecny
cba253439a
CC-1927: Remove PEAR DB
...
-various fixes
2012-04-19 16:54:38 -04:00
paul.baranowski
235997c616
CC-1927 Remove PEAR DB
...
* Removed the DEB package "php-db" from the full install script as it is
no longer needed.
* Missed one call to PEAR::isError()
2012-04-19 16:35:19 -04:00
paul.baranowski
9ec584e90c
CC-1927 Remove PEAR DB
...
Removed remaining references to $CC_DBC
2012-04-19 16:35:19 -04:00
paul.baranowski
96b010e7f0
CC-1927 Remove PEAR DB
...
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
even when it cant connect to the database. Also fixed return value to
be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
paul.baranowski
7f78a7f663
CC-1927: Remove PEAR DB
...
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
2012-04-19 16:33:05 -04:00
paul.baranowski
f69a172ee1
Commented out a bunch of Logging debug lines. There was a lot of output
...
being logged in the Zend log file.
2012-04-19 16:16:56 -04:00
James
45fa1efc2d
CC-3603: Calendar->Once you update the rebroadcasted show it disappears
...
- fixed
2012-04-19 12:56:15 -04:00
James
8bd3a35789
CC-3683: Upgraded database not equivalent to fresh install database part 1
...
- fixed
2012-04-19 11:24:30 -04:00
denise
8588857def
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed
2012-04-18 16:49:32 -04:00
denise
7de74f2540
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-18 16:14:04 -04:00
denise
79f3473dfe
CC-3674: Cannot add songs to 'Now Playing' nor Playlists
...
-fixed for Now Playing
2012-04-18 16:13:52 -04:00
James
58f4727f17
CC-3666: Default Playlist fade in/out time is not zero.
...
- fixed
2012-04-18 16:06:23 -04:00
James
897b61b357
CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours
...
- fixed
2012-04-18 14:00:40 -04:00
James
000f7d549c
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- fixed a bug where variable name wasn't changed
2012-04-18 12:25:10 -04:00
denise
53a85204da
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed (check for array length after explode())
2012-04-17 16:52:59 -04:00
James
5df1fede9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 15:43:39 -04:00
James
a91785ff42
CC-3652: Can't edit current show if it's a single instance
...
when the timezone is in CEST(prague timezone)
- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
2012-04-17 15:43:18 -04:00
Naomi Aro
4732c0ad67
CC-733 : Broadcast Log
2012-04-17 18:59:17 +02:00
Martin Konecny
2c4df4853a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:38:55 -04:00
Martin Konecny
79b9de203d
-Better attempt at getting at least 3 items
2012-04-16 18:38:48 -04:00
denise
2fc591db2b
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-16 17:09:54 -04:00
James
9aa814212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 14:58:03 -04:00
James
df3acb5590
CC-3654: Cannot resize current (non-repeating) show on the calendar
...
- fixed
2012-04-16 14:57:53 -04:00
Naomi Aro
7e3112e3d7
CC-3610 : Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
2012-04-16 18:31:15 +02:00
Naomi Aro
b5f48c7732
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:16:33 +02:00
Naomi Aro
b9d82a579f
CC-3407 : Timeline: Display if tracks are missing on disk
2012-04-16 18:16:24 +02:00
Martin Konecny
a6c0a1d2d9
-removed erroneous import
2012-04-16 12:04:35 -04:00
Naomi Aro
a0fb607d30
Merge branch 'CC-3174' into devel
2012-04-16 16:40:02 +02:00
Naomi Aro
c96c60dc5a
CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files
...
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
2012-04-16 16:33:32 +02:00
James
ffc17ba705
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00
Martin Konecny
5a2d55ef84
CC-3520: Change default password of monit
...
-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
2012-04-13 16:58:12 -04:00
James
3ae8eb9105
CC-3622: When changing location of the stor directory, the "organize"
...
subfolder is not being created
- fixed
2012-04-13 15:09:59 -04:00
James
36ca2c29fc
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't marking the file as deleted
- using propel instead of PEAR DB
2012-04-13 15:03:27 -04:00
James
1bb04296a9
CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high)
...
- the regular exp check in model class was wrong
2012-04-13 12:05:59 -04:00
Naomi Aro
ef908ee894
CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences)
2012-04-13 11:09:52 +02:00
James
6e1bf50009
CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly
...
- fixed
2012-04-12 18:49:24 -04:00
James
fd700c225c
CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files
...
be remover from server
- RecallByMd5() was checking against all cc_files entries which includes
deleted files
2012-04-12 17:37:14 -04:00
James
c706bc32fd
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- fixed
2012-04-12 17:23:26 -04:00
James
d4533ca545
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 17:19:03 -04:00
James
c6ad9462af
CC-3634: Media Folder: if file was deleted from file system, and the file
...
was scheduled in the future, it wasn't getting deleted from Airtime
- fixed a bug
2012-04-12 17:18:45 -04:00
denise
62cd704d1c
--added comment
2012-04-12 17:12:43 -04:00
denise
9d4a474521
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 17:07:27 -04:00
denise
fe68d0fc87
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-12 16:25:01 -04:00
James
f522c7a7af
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 16:17:36 -04:00
James
53e37ee826
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't getting deleted from AIrtime
- fixed
2012-04-12 16:17:19 -04:00
Martin Konecny
c2db20f004
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-cleanup
2012-04-12 15:10:40 -04:00
Martin Konecny
bfed474b7b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:41:18 -04:00
denise
a2fedaa3f1
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 13:36:45 -04:00
Martin Konecny
83d78eb0dd
-check if exec function is available before using it
2012-04-12 13:36:36 -04:00
Martin Konecny
380094b4cc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:29:58 -04:00
Martin Konecny
04718a88ae
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-done
2012-04-12 13:29:49 -04:00
James
4ef18fb00f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 12:22:36 -04:00
James
c90a8006cc
CC-3622: When changing location of the stor directory, the "organize"
...
ubfolder is not being created.
- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
2012-04-12 12:22:20 -04:00
Naomi Aro
0486d33e27
Merge branch 'CC-3174' into devel
2012-04-12 18:12:01 +02:00
Naomi Aro
adddd1085c
CC-3592 : Calendar-> Recorded Shows do not get Rebroadcasted at the moment
...
added a flag whether to check user permissions or not.
2012-04-12 18:00:38 +02:00
Martin Konecny
8303eb728e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 11:54:58 -04:00
Martin Konecny
5a8df0321e
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-12 11:54:51 -04:00
denise
d06b3573e9
CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO")
...
-fixed
2012-04-11 19:22:47 -04:00
Martin Konecny
bdd3444acf
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-11 16:45:03 -04:00
James
f0be7cc995
- comments and removing logging
2012-04-11 16:06:10 -04:00
James
8f197115ae
CC-3618: Current playing Text Field in Dashboard alternates between "Nothing
...
Scheduled" and "current playing song"
- fixed
2012-04-11 15:54:03 -04:00
James
13502b4c08
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-11 12:27:54 -04:00
James
f82aef2a85
CC-3566: Preferences->"Fade In" is not respected when Show starts
...
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
2012-04-11 12:27:41 -04:00
Martin Konecny
a09a31bc88
CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
...
-pypo side fixed
2012-04-10 23:13:52 -04:00
Naomi Aro
428d04d77f
CC-3605 : Create 2.1 upgrades
2012-04-10 18:07:39 +02:00
Naomi Aro
b998a04c2e
Merge branch 'devel' into CC-3174
2012-04-10 15:57:13 +02:00
Naomi Aro
1dcced18ac
CC-3605 : Create 2.1 upgrades
2012-04-10 14:45:48 +02:00
James
954fa2bceb
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
Naomi Aro
35a89e0308
CC-3174 : timeline
2012-04-05 15:52:16 +02:00
Naomi Aro
0b3809c379
CC-3110 : Password reset
...
added sender email to preferences form, created db upgrade script.
2012-04-05 14:18:42 +02:00
James
cde8e07c0b
CC-3581: Calendar->It should not be possible to change the duration for
...
the recorded show
- fixed
2012-04-04 16:26:28 -04:00
James
5da7d42290
CC-3548: Schedule: Separate repeate show template and single instance on
...
'When' section
- UI portion of the feature
2012-04-04 14:53:26 -04:00
Martin Konecny
366ea78fce
CC-3532: Now Playing GUI-> Progress bar is still playing after end of show
...
-fixed
2012-04-03 18:29:36 -04:00
Martin Konecny
edcce7432d
CC-3409: System status page times out if monit is not running.
...
-Fixed
2012-04-03 17:38:59 -04:00
James
4cb64b0eb1
CC-3569: Update total track metric to only report tracks that exist
...
- fixed
2012-04-03 15:53:55 -04:00
Naomi Aro
057ca55074
CC-3589 : Send cancel recording message to pypo
2012-04-03 18:43:13 +02:00
Naomi Aro
711105aade
CC-3588 : Cancelling Empty Show gives "Invalid Request"
2012-04-03 18:26:04 +02:00
Naomi Aro
d2d45dcae6
CC-3587 : index problem in scheduling.
2012-04-03 17:56:50 +02:00
Naomi Aro
079862d2f2
CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date"
2012-04-03 16:11:53 +02:00
Naomi Aro
5dfaa00c25
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-03 11:15:22 +02:00
Martin Konecny
2e88801dad
CC-3562: NOWPlaying->Overbooked Show1 introduces problems to itself and to the next
...
-fixed
2012-04-02 17:28:05 -04:00
Naomi Aro
c5b761bff3
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:31:02 +02:00
Naomi Aro
eeb7273909
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:20:13 +02:00
Naomi Aro
b39db57d0c
CC-3501 : Calendar->Show->Add media files from Library better usability may be proposed
2012-03-30 14:45:30 +02:00
Naomi Aro
9e9ae11725
CC-3551 : Change Cue Out for currently deleted track
2012-03-30 12:24:55 +02:00
James
5b65b56b93
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-29 16:57:49 -04:00
James
7325d51ada
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
2012-03-29 16:57:28 -04:00
Naomi Aro
cea37774ca
CC-3551 : Change Cue Out for currently deleted track
2012-03-29 19:20:02 +02:00
Naomi Aro
5a24331ef6
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 17:37:18 +02:00
Naomi Aro
12b23443db
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 16:27:08 +02:00
Naomi Aro
0746115d2c
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-29 11:06:57 +02:00
James
4f5d7efaa1
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- done
2012-03-28 15:12:01 -04:00
Naomi Aro
d12ef1c7a2
CC-3536 : Work out ACL with library on NowPlaying when it's a guest User
2012-03-28 18:43:44 +02:00
Naomi Aro
4904a16ebb
CC-3534 : Check Scheduling Edge Cases
...
extracting out error checking in scheduling, added created column to cc_showinstances
2012-03-28 14:23:25 +02:00
Naomi Aro
b70773489a
CC-3534 : Check Scheduling Edge Cases
...
not allowing users to add to a show that has ended.
2012-03-28 10:50:02 +02:00
Naomi Aro
9c52b2ee1f
CC-3174 : showbuilder
...
fixing jplayer preview
2012-03-27 16:27:43 +02:00
Naomi Aro
296a5c583a
CC-3407 : Timeline: Display if tracks are missing on disk
2012-03-27 15:16:07 +02:00
Naomi Aro
451b573c52
Merge branch 'CC-3174' into devel
2012-03-27 14:14:58 +02:00