]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/log
people/amarx/ipfire-3.x.git
11 years agoMerge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
Michael Tremer [Fri, 8 Jun 2012 11:15:38 +0000 (13:15 +0200)] 
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
usbutils/usbutils.nm

11 years agobash: Fix creation of man pages.
Michael Tremer [Fri, 8 Jun 2012 11:13:25 +0000 (13:13 +0200)] 
bash: Fix creation of man pages.

Bash needs texinfo to generate the man pages.
Fixes #10147.

11 years agousbutils: Install this package on every system.
Michael Tremer [Fri, 8 Jun 2012 11:09:38 +0000 (13:09 +0200)] 
usbutils: Install this package on every system.

11 years agoman-db: Make package more handy.
Michael Tremer [Thu, 7 Jun 2012 20:21:38 +0000 (22:21 +0200)] 
man-db: Make package more handy.

This patch adds a cron job which will index the man pages daily
and executed after the package has been installed.

Also is elinks the new browser (and currently the single on
IPFire is shipping).

11 years agobison: Update to 2.5.1.
Michael Tremer [Thu, 7 Jun 2012 13:25:59 +0000 (15:25 +0200)] 
bison: Update to 2.5.1.

Fixes #10146.

11 years agodhcp: dhclient: Put unit file into right package.
Michael Tremer [Thu, 7 Jun 2012 12:17:49 +0000 (14:17 +0200)] 
dhcp: dhclient: Put unit file into right package.

Fixes #10144.

11 years agovim: Import latest patches from upstream.
Michael Tremer [Thu, 7 Jun 2012 12:11:18 +0000 (14:11 +0200)] 
vim: Import latest patches from upstream.

These patch provide minor fixes for various bugs and problems.

11 years agoipfire-release: Fix escaping for ANSI_COLOR variable.
Michael Tremer [Sun, 3 Jun 2012 14:31:18 +0000 (16:31 +0200)] 
ipfire-release: Fix escaping for ANSI_COLOR variable.

11 years agomiredo: New package.
Michael Tremer [Thu, 31 May 2012 13:37:31 +0000 (15:37 +0200)] 
miredo: New package.

Miredo is a teredo client.

11 years agobinutils: Update to 2.22.52.0.3.
Michael Tremer [Wed, 30 May 2012 14:00:01 +0000 (16:00 +0200)] 
binutils: Update to 2.22.52.0.3.

11 years agoiptables: Update to 1.4.14.
Michael Tremer [Wed, 30 May 2012 09:57:22 +0000 (11:57 +0200)] 
iptables: Update to 1.4.14.

References #10140.

11 years agolibusb: The package is removed in favor to libusbx.
Michael Tremer [Wed, 30 May 2012 09:53:04 +0000 (11:53 +0200)] 
libusb: The package is removed in favor to libusbx.

11 years agolibusbx: New package.
Michael Tremer [Wed, 30 May 2012 09:51:39 +0000 (11:51 +0200)] 
libusbx: New package.

libusbx is a fork of libusb which is hardly maintained at the moment.
Because the maintainer did not accept patches, the fork was created
and set as a new goal to support more platforms.

On IPFire, libusbx will replace libusb.

11 years agoopenssh: The server package requires audit to be present.
Michael Tremer [Mon, 28 May 2012 19:49:08 +0000 (21:49 +0200)] 
openssh: The server package requires audit to be present.

11 years agoMerge remote-tracking branch 'stevee/gobject-introspection'
Michael Tremer [Mon, 28 May 2012 17:25:10 +0000 (19:25 +0200)] 
Merge remote-tracking branch 'stevee/gobject-introspection'

11 years agogobject-introspection: Update to 1.31.22.
Stefan Schantl [Mon, 28 May 2012 16:46:59 +0000 (18:46 +0200)] 
gobject-introspection: Update to 1.31.22.

Update to latest major release.
The new version is required to build systemd/udev with introspection support.

11 years agoMerge remote-tracking branch 'stevee/cryptsetup-luks'
Michael Tremer [Sun, 27 May 2012 17:48:20 +0000 (19:48 +0200)] 
Merge remote-tracking branch 'stevee/cryptsetup-luks'

11 years agocryptsetup-luks: Update to 1.4.2.
Stefan Schantl [Sun, 27 May 2012 14:43:49 +0000 (16:43 +0200)] 
cryptsetup-luks: Update to 1.4.2.

The new cryptsetup-luks is required to build systemd-183.
I've also add a compat package for the old 1.1.0 libcryptsetup.

11 years agodhcp: Update the systemd unit file for dhclient.
Michael Tremer [Sun, 27 May 2012 12:18:22 +0000 (12:18 +0000)] 
dhcp: Update the systemd unit file for dhclient.

This update enables dhclient to be properly used
with the current networking code.

11 years agohostapd: Make systemd unit file independent from network.service.
Michael Tremer [Sun, 27 May 2012 12:16:16 +0000 (12:16 +0000)] 
hostapd: Make systemd unit file independent from network.service.

Within the startup of network.service, hostapd needs to be
started which will cause a deadlock.
This patch removes the requirement of hostapd, that the network
service has already to be up.

11 years agoudev: Build cannot require usbutils-devel which does not exist.
Michael Tremer [Sun, 27 May 2012 11:37:42 +0000 (13:37 +0200)] 
udev: Build cannot require usbutils-devel which does not exist.

11 years agousbutils: Remove empty packages.
Michael Tremer [Sun, 27 May 2012 10:18:42 +0000 (12:18 +0200)] 
usbutils: Remove empty packages.

11 years agoudev: Fix location of usb.ids file.
Michael Tremer [Sat, 26 May 2012 20:13:58 +0000 (22:13 +0200)] 
udev: Fix location of usb.ids file.

The usbutils package provided the usb.ids file which
was located in a wrong path. The right file resides in
/usr/share/hwdata which requires a whole rebuild of udev.

11 years agousbutils: Update to 005.
Michael Tremer [Sat, 26 May 2012 20:10:58 +0000 (22:10 +0200)] 
usbutils: Update to 005.

Basicly this patch removes the usb.ids file from the package
which is provided by hwdata.

11 years agomstpd: Update to SVN version 30.
Michael Tremer [Fri, 25 May 2012 20:38:41 +0000 (22:38 +0200)] 
mstpd: Update to SVN version 30.

This release does not enable mstpd by default anymore.
This saves us from running an extra daemon when STP is
not used on any zone.

11 years agoMerge remote-tracking branch 'stevee/xclock'
Michael Tremer [Thu, 24 May 2012 19:03:57 +0000 (21:03 +0200)] 
Merge remote-tracking branch 'stevee/xclock'

11 years agoMerge remote-tracking branch 'stevee/fontforge-fix'
Michael Tremer [Thu, 24 May 2012 19:03:52 +0000 (21:03 +0200)] 
Merge remote-tracking branch 'stevee/fontforge-fix'

11 years agoxclock: New package.
Stefan Schantl [Thu, 24 May 2012 19:00:39 +0000 (21:00 +0200)] 
xclock: New package.

11 years agofontforge: Add more build dependencies.
Stefan Schantl [Thu, 24 May 2012 18:55:26 +0000 (20:55 +0200)] 
fontforge: Add more build dependencies.

libXft-devel and pango with enabled support are required to build fontforge
on any architecture except x86_64.

11 years agopango: Enable xft support from libXft.
Stefan Schantl [Thu, 24 May 2012 18:52:30 +0000 (20:52 +0200)] 
pango: Enable xft support from libXft.

This is required to build fontforge.

11 years agoMerge remote-tracking branch 'stevee/qt'
Michael Tremer [Thu, 24 May 2012 16:48:31 +0000 (18:48 +0200)] 
Merge remote-tracking branch 'stevee/qt'

11 years agopython-qtermwidget: Forgot to increase release number.
Stefan Schantl [Thu, 24 May 2012 16:46:22 +0000 (18:46 +0200)] 
python-qtermwidget: Forgot to increase release number.

I've forgot to increase the release number on my last commit.
16d8ba54d66ffebb4765186fa2a4bed4a7ca4516

11 years agogrub: Fix packaging of efi modules.
Michael Tremer [Thu, 24 May 2012 08:41:38 +0000 (10:41 +0200)] 
grub: Fix packaging of efi modules.

Also remove efi_gop and efi_uga from the grub-efi image
in favor of all_video.

11 years agoMerge remote-tracking branch 'stevee/qt'
Michael Tremer [Thu, 24 May 2012 08:40:45 +0000 (10:40 +0200)] 
Merge remote-tracking branch 'stevee/qt'

11 years agopython-qtermwidget: Add qt-devel as build dependency.
Stefan Schantl [Wed, 23 May 2012 20:01:09 +0000 (22:01 +0200)] 
python-qtermwidget: Add qt-devel as build dependency.

qt-devel was missing, so the build allways fails an each architecture.

11 years agopyQt: Update to 4.9.1.
Stefan Schantl [Wed, 23 May 2012 19:58:25 +0000 (21:58 +0200)] 
pyQt: Update to 4.9.1.

Update to latest stable version.

11 years agosip: Update to 4.13.2.
Stefan Schantl [Wed, 23 May 2012 19:55:57 +0000 (21:55 +0200)] 
sip: Update to 4.13.2.

Update to latest stable version.
Add download url for source tarball.

11 years agoqt: Update to version 4.8.1.
Stefan Schantl [Wed, 23 May 2012 16:32:09 +0000 (18:32 +0200)] 
qt: Update to version 4.8.1.

Update to latest stable release.
Change project url to new home.
Add download url for source tarball.
Fix build error on armv7hl.

We have to enable openssl support ( use system libssl and link against it ), because the new pyQt only compile with openssl suport. The old pyQt doesn't compile anymore  with qt 4.8.1.

11 years agoMerge remote-tracking branch 'kbarthel/man-pages'
Michael Tremer [Mon, 21 May 2012 18:34:20 +0000 (20:34 +0200)] 
Merge remote-tracking branch 'kbarthel/man-pages'

11 years agoman-pages: Updated the source to version 3.40
Kim Barthel [Mon, 21 May 2012 18:23:51 +0000 (20:23 +0200)] 
man-pages: Updated the source to version 3.40

Added the sources @ kernel.org
See ticket #10127 for further details

11 years agoMerge remote-tracking branch 'stevee/avahi'
Michael Tremer [Sun, 20 May 2012 14:51:16 +0000 (16:51 +0200)] 
Merge remote-tracking branch 'stevee/avahi'

11 years agoavahi: Add systemd service file and scriptlet.
Stefan Schantl [Sun, 20 May 2012 10:31:23 +0000 (12:31 +0200)] 
avahi: Add systemd service file and scriptlet.

Add configure option to install native systemd service file.

Fixes #10134.

11 years agogcc: Update to 4.7.0.
Michael Tremer [Sun, 20 May 2012 12:34:17 +0000 (14:34 +0200)] 
gcc: Update to 4.7.0.

This is a major update to the latest version of GCC.

Be aware of imminent build failures because of new compiler
warnings. There are no really great new features for us, but
the compiler should generate better code as always.

11 years agoSDL: Update to 1.2.15.
Michael Tremer [Sun, 20 May 2012 10:31:45 +0000 (12:31 +0200)] 
SDL: Update to 1.2.15.

This release will make SDL independent from directfb.

11 years agoMerge remote-tracking branch 'stevee/armv5tel-xorg-x11-server'
Michael Tremer [Sun, 20 May 2012 09:58:10 +0000 (11:58 +0200)] 
Merge remote-tracking branch 'stevee/armv5tel-xorg-x11-server'

Conflicts:
xorg-x11-server/xorg-x11-server.nm

11 years agoMerge remote-tracking branch 'stevee/dejavu-fonts'
Michael Tremer [Sat, 19 May 2012 20:52:51 +0000 (22:52 +0200)] 
Merge remote-tracking branch 'stevee/dejavu-fonts'

11 years agoMerge remote-tracking branch 'stevee/perl-Font-TTF'
Michael Tremer [Sat, 19 May 2012 20:52:21 +0000 (22:52 +0200)] 
Merge remote-tracking branch 'stevee/perl-Font-TTF'

11 years agoMerge remote-tracking branch 'stevee/unicode-ucd'
Michael Tremer [Sat, 19 May 2012 20:51:49 +0000 (22:51 +0200)] 
Merge remote-tracking branch 'stevee/unicode-ucd'

11 years agoMerge remote-tracking branch 'stevee/fontforge'
Michael Tremer [Sat, 19 May 2012 20:51:15 +0000 (22:51 +0200)] 
Merge remote-tracking branch 'stevee/fontforge'

11 years agoMerge remote-tracking branch 'stevee/cairo'
Michael Tremer [Sat, 19 May 2012 20:50:09 +0000 (22:50 +0200)] 
Merge remote-tracking branch 'stevee/cairo'

11 years agoMerge remote-tracking branch 'stevee/pixman'
Michael Tremer [Sat, 19 May 2012 20:50:05 +0000 (22:50 +0200)] 
Merge remote-tracking branch 'stevee/pixman'

11 years agofontforge: New package.
Stefan Schantl [Sat, 19 May 2012 20:37:34 +0000 (22:37 +0200)] 
fontforge: New package.

11 years agounicode-ucd: New package.
Stefan Schantl [Sat, 19 May 2012 20:20:24 +0000 (22:20 +0200)] 
unicode-ucd: New package.

11 years agodejavu-fonts: New package.
Stefan Schantl [Sat, 19 May 2012 20:34:01 +0000 (22:34 +0200)] 
dejavu-fonts: New package.

11 years agoperl-Font-TTF: New package.
Stefan Schantl [Sat, 19 May 2012 18:17:10 +0000 (20:17 +0200)] 
perl-Font-TTF: New package.

11 years agopixman: Update to 0.25.6.
Stefan Schantl [Sat, 19 May 2012 17:44:19 +0000 (19:44 +0200)] 
pixman: Update to 0.25.6.

Update pixman to latest release.
Enable support for PNG.

11 years agocairo: Update to 1.12.2.
Stefan Schantl [Sat, 19 May 2012 17:44:53 +0000 (19:44 +0200)] 
cairo: Update to 1.12.2.

Update to latest stable version.
Also activate support for Xlib and XML2.

11 years agoicap: Changed config file directory.
Christian Schmidt [Sat, 12 May 2012 16:23:13 +0000 (18:23 +0200)] 
icap: Changed config file directory.

There is a dependency when building the packages, the modules seem
to rely on the master sysconfdir and ignoring there own sysconfdir.
This is whierd when building the modules with the old icap master
packages leading to config files in /etc even when you point it
elsewhere. You need to build the icap packages first and point the
sysconfdir to /etc/anywhere and then the modules will install there
too, ignoring what you´ve configured with the sysconfdir for the
package.

Thats why both will install in /etc/c-icap because you can not link
the modules elsewhere.

Fixes #10125

11 years agoplymouth: Make the bar a little bit brighter in the second section.
Michael Tremer [Fri, 18 May 2012 09:51:29 +0000 (11:51 +0200)] 
plymouth: Make the bar a little bit brighter in the second section.

The progress bar in text mode has now got three colours.

11 years agosudo: Update to 1.8.5.
Michael Tremer [Thu, 17 May 2012 19:23:08 +0000 (21:23 +0200)] 
sudo: Update to 1.8.5.

11 years agogrub: Fix build error on i686.
Michael Tremer [Thu, 17 May 2012 18:38:05 +0000 (20:38 +0200)] 
grub: Fix build error on i686.

Does not ignore the missing NX bit.

11 years agovlan: Move vconfig to /usr and install man page.
Michael Tremer [Thu, 17 May 2012 18:09:25 +0000 (20:09 +0200)] 
vlan: Move vconfig to /usr and install man page.

11 years agogrub: Update to 2.00~beta5.
Michael Tremer [Thu, 17 May 2012 17:28:31 +0000 (19:28 +0200)] 
grub: Update to 2.00~beta5.

This commit removes the old "theme" and the splash
screen. Both should be provided by the system-logos
package soon.

11 years agoMerge remote-tracking branch 'ms/kernel-3.3.6'
Michael Tremer [Thu, 17 May 2012 15:43:01 +0000 (17:43 +0200)] 
Merge remote-tracking branch 'ms/kernel-3.3.6'

11 years agokernel: Update to 3.3.6.
Michael Tremer [Mon, 26 Mar 2012 09:50:43 +0000 (11:50 +0200)] 
kernel: Update to 3.3.6.

This commit updates the Linux kernel from 3.2 to 3.3.

The kernel module for Advansys SCSI and NSP32 hardware
had to be disabled on ARM because they FTBFS.

11 years agoMerge remote-tracking branch 'stevee/pdns'
Michael Tremer [Thu, 17 May 2012 12:33:24 +0000 (14:33 +0200)] 
Merge remote-tracking branch 'stevee/pdns'

11 years agopdns: Update to 3.1.
Stefan Schantl [Wed, 16 May 2012 21:05:42 +0000 (23:05 +0200)] 
pdns: Update to 3.1.

* Update Power DNS to latest stable version.
* Remove patch, which has become upstream.

Fixes #10118.

11 years agoMerge remote-tracking branch 'maniacikarus/man-db'
Michael Tremer [Wed, 16 May 2012 20:45:52 +0000 (22:45 +0200)] 
Merge remote-tracking branch 'maniacikarus/man-db'

11 years agolibjpeg: Update to 1.2.0.
Stefan Schantl [Wed, 16 May 2012 18:49:20 +0000 (20:49 +0200)] 
libjpeg: Update to 1.2.0.

Updated to latest stable release of libjpeg-turbo (1.2.0).

Fixes #10133.

11 years agopowertop: Update to 2.0.
Michael Tremer [Tue, 15 May 2012 20:00:06 +0000 (22:00 +0200)] 
powertop: Update to 2.0.

powertop moved to a new home, so the URL has been updated.

11 years agoopenssl: Fix some unreliable lines in the makefile.
Michael Tremer [Tue, 15 May 2012 19:59:19 +0000 (21:59 +0200)] 
openssl: Fix some unreliable lines in the makefile.

11 years agogmp: Update to 5.0.5.
Michael Tremer [Tue, 15 May 2012 19:58:43 +0000 (21:58 +0200)] 
gmp: Update to 5.0.5.

Minor bugfix release.

11 years agoMerge remote-tracking branch 'ms/powertop'
Michael Tremer [Tue, 8 May 2012 21:27:53 +0000 (23:27 +0200)] 
Merge remote-tracking branch 'ms/powertop'

11 years agopowertop: Update to 1.98.
Michael Tremer [Tue, 8 May 2012 21:23:20 +0000 (23:23 +0200)] 
powertop: Update to 1.98.

11 years agoxorg-x11-server: Temporary remove some runtime dependencies.
Stefan Schantl [Tue, 8 May 2012 19:53:43 +0000 (21:53 +0200)] 
xorg-x11-server: Temporary remove some runtime dependencies.

Temporary remove the following runtime deps to allow building
on armv5tel:

- xorg-x11-drv-evdev
- xorg-x11-drv-keyboard
- xorg-x11-drv-mouse
- xorg-x11-drv-vesa

11 years agoxorg-x11-server: Readd removed runtime dependencies from last commit.
Stefan Schantl [Tue, 8 May 2012 19:56:37 +0000 (21:56 +0200)] 
xorg-x11-server: Readd removed runtime dependencies from last commit.

Readd removed dependencies after successfull build on armv5tel.

11 years agoxorg-x11-server: Temporary remove some runtime dependencies.
Stefan Schantl [Tue, 8 May 2012 19:53:43 +0000 (21:53 +0200)] 
xorg-x11-server: Temporary remove some runtime dependencies.

Temporary remove the following runtime deps to allow building
on armv5tel:

- xorg-x11-drv-evdev
- xorg-x11-drv-keyboard
- xorg-x11-drv-mouse
- xorg-x11-drv-vesa

11 years agogrep: updated to 2.12.
Arne Fitzenreiter [Tue, 8 May 2012 08:48:00 +0000 (10:48 +0200)] 
grep: updated to 2.12.

fixes #10121.

11 years agoMerge remote-tracking branch 'stevee/mesa'
Michael Tremer [Mon, 7 May 2012 20:53:03 +0000 (22:53 +0200)] 
Merge remote-tracking branch 'stevee/mesa'

11 years agomesa: Update to 7.11.2.
Stefan Schantl [Mon, 7 May 2012 19:06:14 +0000 (21:06 +0200)] 
mesa: Update to 7.11.2.

Fix compile error's on ARM.
Add selinux support
Add pic support - now all libraries are full relro.

11 years agostrace: Update to strace 4.7.
Christian Schmidt [Mon, 7 May 2012 16:16:33 +0000 (18:16 +0200)] 
strace: Update to strace 4.7.

Fixes #10120

11 years agonss_ldap: Fix build on ARM.
Michael Tremer [Sun, 6 May 2012 23:13:54 +0000 (01:13 +0200)] 
nss_ldap: Fix build on ARM.

The shared object links were not created in the right way
on ARM machines.

11 years agoMerge remote-tracking branch 'stevee/makedepend'
Michael Tremer [Sun, 6 May 2012 21:10:33 +0000 (23:10 +0200)] 
Merge remote-tracking branch 'stevee/makedepend'

11 years agomakedepend: New package.
Stefan Schantl [Sun, 6 May 2012 21:06:30 +0000 (23:06 +0200)] 
makedepend: New package.

This is required to build newer version's of mesa.

11 years agomstpd: Update to SVN version 28.
Michael Tremer [Sun, 6 May 2012 20:04:12 +0000 (22:04 +0200)] 
mstpd: Update to SVN version 28.

11 years agoMerge remote-tracking branch 'arne_f/python'
Michael Tremer [Sun, 6 May 2012 18:43:54 +0000 (20:43 +0200)] 
Merge remote-tracking branch 'arne_f/python'

11 years agozlib: Update to 1.2.7.
Michael Tremer [Sun, 6 May 2012 16:48:11 +0000 (18:48 +0200)] 
zlib: Update to 1.2.7.

11 years agoMerge remote-tracking branch 'arne_f/strongswan'
Michael Tremer [Sun, 6 May 2012 16:31:41 +0000 (18:31 +0200)] 
Merge remote-tracking branch 'arne_f/strongswan'

11 years agopython: security update to 2.7.3.
Arne Fitzenreiter [Sun, 6 May 2012 16:07:34 +0000 (18:07 +0200)] 
python: security update to 2.7.3.

fixes #10085

11 years agostrongswan: updated to 4.6.3.
Arne Fitzenreiter [Sun, 6 May 2012 11:14:24 +0000 (13:14 +0200)] 
strongswan: updated to 4.6.3.

fixes #10119

11 years agopolicycoreutils: Update to 2.1.11.
Stefan Schantl [Sun, 6 May 2012 11:10:24 +0000 (13:10 +0200)] 
policycoreutils: Update to 2.1.11.

Update policycoreutils to latest stable version.
Update sepolgen to 1.1.6
Move all binaries to usr.

Fixes #10084.

11 years agoopenssl: Update to 1.0.1b.
Michael Tremer [Fri, 4 May 2012 14:08:30 +0000 (16:08 +0200)] 
openssl: Update to 1.0.1b.

Bug #10102.

11 years agoMerge remote-tracking branch 'stevee/dmraid'
Michael Tremer [Wed, 2 May 2012 17:28:38 +0000 (19:28 +0200)] 
Merge remote-tracking branch 'stevee/dmraid'

11 years agodmraid: Increase release number.
Stefan Schantl [Wed, 2 May 2012 17:23:17 +0000 (19:23 +0200)] 
dmraid: Increase release number.

I've forgot to increase the release number on my last commit:
91e84366671821a8210fa04392906d43c9f356d2

11 years agoMerge remote-tracking branch 'ms/git'
Michael Tremer [Wed, 2 May 2012 15:24:09 +0000 (17:24 +0200)] 
Merge remote-tracking branch 'ms/git'

11 years agoMerge remote-tracking branch 'ms/ncurses-terminfo'
Michael Tremer [Wed, 2 May 2012 15:23:56 +0000 (17:23 +0200)] 
Merge remote-tracking branch 'ms/ncurses-terminfo'

11 years agogit: Install bash-completion file.
Michael Tremer [Wed, 2 May 2012 13:51:39 +0000 (13:51 +0000)] 
git: Install bash-completion file.

bash-completion is a very handy feature and we
want to make use of it.

11 years agoncurses: Package essential terminfo files in -base package.
Michael Tremer [Wed, 2 May 2012 13:49:15 +0000 (13:49 +0000)] 
ncurses: Package essential terminfo files in -base package.

The most essential terminfo files have been moved to /lib/terminfo
which does not exist anymore. But as those files need to be installed
on every system, they are now packaged in the -base package.

11 years agoMerge remote-tracking branch 'maniacikarus/samba'
Michael Tremer [Wed, 2 May 2012 13:30:50 +0000 (15:30 +0200)] 
Merge remote-tracking branch 'maniacikarus/samba'

11 years agoMerge remote-tracking branch 'stevee/dmraid'
Michael Tremer [Wed, 2 May 2012 13:30:45 +0000 (15:30 +0200)] 
Merge remote-tracking branch 'stevee/dmraid'