Commit Graph

16 Commits

Author SHA1 Message Date
Daniel Willmann 60560d74b8 Merge commit '315f10aa4759abb627f39122503874e7006db8b1' into dora 2017-06-02 15:01:44 +02:00
Holger Hans Peter Freyther de1460dab6 Merge commit '10e1b544716747d178e6efa9e798f4141a179f9d' into dora 2015-08-12 07:54:15 +02:00
Holger Hans Peter Freyther 8de2d28267 Merge commit '33995b24737535a751326d4711330a9f96760cac' into dora 2015-07-23 16:08:57 +02:00
Holger Hans Peter Freyther d04b359479 Merge commit '6597f246c5afe7a180774169cff83e55277b51d8' into dora 2015-07-19 21:32:57 +02:00
Holger Hans Peter Freyther 11808b7330 Merge commit '17a8ba8c038aac23bd7cadbc6ed786c72adbb350' into dora 2015-06-24 13:21:16 +02:00
Holger Hans Peter Freyther c09363a966 Merge commit '29faf705ed31e2bf30be8cc0064f26be1851fcc3' into dora 2015-06-23 16:36:22 +02:00
Holger Hans Peter Freyther ad81ff7de9 Merge commit 'bf472b1799a81f46ef0598efd31e64618b8f0730' into dora 2015-05-13 09:33:27 +02:00
Harald Welte 65bed443a2 Merge commit 'a3b942cdd9cb675589ac424130003b892208f371' into dora 2015-05-01 19:47:16 +02:00
Harald Welte bcbe10686b Merge commit '8c70168d4001d029a60ab155042785ff831f3f9b' into dora 2015-05-01 17:51:49 +02:00
Harald Welte e39ad31981 Merge commit '90b40a8448e773237a6d5e241c278867a7eff750' into dora 2015-04-20 20:52:15 +02:00
Holger Hans Peter Freyther bd6b673e26 Merge commit '9934406adea76c57b4f1c34cbf9dfe6e5db35515' into dora 2015-04-20 10:11:40 -04:00
Holger Hans Peter Freyther d98550a233 Merge commit 'e0bcee0206fd3052fd2cf45c587957e6143fd1c7' into dora
With interfaces change from harald and the init script revert
2015-04-20 09:56:59 -04:00
Holger Hans Peter Freyther aa5270f6b1 Merge commit '259e1fa468e8af48c6e3382fe5de025d10bb8fbc' into dora 2015-04-15 18:39:45 -04:00
Holger Hans Peter Freyther 305ee03b28 Merge commit 'e0c7f3c62132ff7b1a9c7d2c01ef2be60c6c0ddc' into dora 2015-04-13 17:43:07 +02:00
Holger Hans Peter Freyther 05216f5a96 Merge commit '8e95d188c5597485b54e3fac8210ea532e221870' into dora 2015-04-10 15:30:44 +02:00
Holger Hans Peter Freyther 436d02dfa6 Merge commit '1f660fd4b00076baa867a75fdf766e8fe2c75b9d' into dora 2015-03-31 17:08:27 +02:00