Commit Graph

108 Commits

Author SHA1 Message Date
Holger Hans Peter Freyther ad81ff7de9 Merge commit 'bf472b1799a81f46ef0598efd31e64618b8f0730' into dora 2015-05-13 09:33:27 +02:00
Harald Welte bd6709ae21 Merge commit '809e9cd999f670950d250b1097a423a4f08fd8a4' into dora 2015-05-03 11:38:12 +02:00
Harald Welte 973134df36 Merge commit '3324575ef58f53ac38c59415de16a510c874200c' into dora 2015-05-02 19:23:06 +02:00
Harald Welte 58a8325efa Merge commit '6938804c99f4e86d917bc504701219ad978f611e' into dora 2015-05-02 17:34:47 +02:00
Harald Welte 864ea38cb9 Merge commit '62856a3a9b246d714d60820582dfa03b34408d6a' into dora 2015-05-02 14:19:42 +02:00
Harald Welte 2a0308613d Merge commit '1e38dac840ad6493b68559d5878f1bb4bbe95027' into dora 2015-05-02 12:29:34 +02:00
Harald Welte 0ac57c632d Merge commit '98a3705d93d238a66110adc9082f32685ae19f05' into dora 2015-05-02 12:02:37 +02:00
Harald Welte c1651f735b Merge commit 'b3923ebb690cad9ad0ca8d0c7a021cf82ea5ae59' into dora 2015-05-02 09:30:28 +02:00
Harald Welte 2a74413574 Merge commit 'ef40d4a5fd63b1477c184d2e4c50e6d7a124fd59' into dora 2015-05-02 09:21:19 +02:00
Harald Welte 9604d878c8 Merge commit '9c3c430ea2350ee45bf05c82b8d1333f3bf71370' into dora 2015-05-02 09:15:56 +02:00
Harald Welte f5860b5721 Merge commit 'fb51ce8a2e804cc0a5fd0975a00c3be44cda8767' into dora 2015-05-02 09:11:13 +02:00
Harald Welte 416847b66d Merge commit '66b18ff049314e3ad2c9ddd92b64ae319470ed7f' into dora 2015-05-01 23:30:14 +02:00
Harald Welte e31d5e8e13 Merge commit '4c6162968fc7b298bff6c06861bb287d35d0863f' into dora 2015-05-01 20:00:09 +02:00
Harald Welte 65bed443a2 Merge commit 'a3b942cdd9cb675589ac424130003b892208f371' into dora 2015-05-01 19:47:16 +02:00
Harald Welte 2d72c18711 Merge commit 'c2ef6813b8ffe7c60bb04404474a31bd83bea034' into dora 2015-05-01 19:38:39 +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 121891e463 Merge commit '9bd8feb83c1e5259ef705cc641cc968362a04fe6' into dora 2015-04-14 15:10:28 +02:00
Holger Hans Peter Freyther 16ebad57f0 Merge commit '15dc869cdacf69bb3728ff0d47f7ff1ffbe18fca' into dora 2015-04-13 18:10:16 +02:00
Holger Hans Peter Freyther 3207d4b477 Merge commit '1ef790672e6bdb4ae7e281dcb71edb674c931474' into dora 2015-04-13 17:51:42 +02:00
Holger Hans Peter Freyther 305ee03b28 Merge commit 'e0c7f3c62132ff7b1a9c7d2c01ef2be60c6c0ddc' into dora 2015-04-13 17:43:07 +02:00
Holger Hans Peter Freyther 1620d1e81d Merge commit 'ba8eee83bd2ac4d13a00b20d92ed2c19a20052bc' into dora 2015-04-13 17:14:32 +02:00
Holger Hans Peter Freyther e855697bcb Merge commit 'ad976e4eb3c8c531d6fe808b5d68c48e05a81877' into dora 2015-04-13 16:57:16 +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
Holger Hans Peter Freyther a44ed4fd61 Merge commit '143a630c0239817377cb40b6173b6899d7160a7e' into dora 2015-02-27 11:47:41 +01:00
Holger Hans Peter Freyther 70f58e7a77 Merge commit 'e4452116a837368dd385b548323822f3f90baa2b' into dora 2015-02-27 09:38:48 +01:00
Holger Hans Peter Freyther 8850542075 Merge commit '1241f0e762cadab0ac6d5ccb4e866286b4799d7d' into dora 2015-02-27 09:10:54 +01:00
Holger Hans Peter Freyther 20d11ba2a2 Merge commit '9f334509d84ead91d73e5ff2c44eb7d22d5a95e6' into dora 2015-02-24 14:21:09 +01:00
Harald Welte 78a71230c3 Merge commit '7daf173e303492e1fb8400793841e305529c3852' into dora 2015-02-23 21:48:46 +01:00
Harald Welte 77bd929be1 Merge commit 'c2356c429d8cfd6c22d694f67b70de62c1bca643' into dora 2015-02-23 21:06:16 +01:00
Harald Welte be1e58f0c3 Merge commit '9b377fd3a960f56e3f2dc46f3d7006ed6c8cf587' into dora 2015-02-23 16:31:04 +01:00
Holger Hans Peter Freyther d25cb4280e Merge commit '67d4fc8d404982d5ca95a68f98005e0c2b486f28' into dora 2015-02-22 14:31:44 +01:00
Holger Hans Peter Freyther 59806e79f4 Merge commit '06fe8c4e401b9b8da6fd5b575899277dd37a5f0d' into dora 2015-02-22 14:26:52 +01:00
Holger Hans Peter Freyther bb52b805a1 Merge commit '675690cc52e6ec13a402472779ab37f266125c19' into dora 2015-02-22 13:35:00 +01:00
Holger Hans Peter Freyther 6cae788ecb Merge commit 'cf53c2b4e0f32697f9c13ae74a22d3f5e56e9b84' into dora 2015-02-22 02:13:29 +01:00
Harald Welte 7fe10b247b Merge commit '4235a5776f5be9a989985048b192d2dd78ced809' into dora 2015-02-20 14:32:37 +01:00
Harald Welte 4a476598a3 Merge commit '42d9a2747fc9bf704e9cc3e37d70e596d2f73899' into dora 2015-02-20 12:43:19 +01:00
Harald Welte e02115a382 Merge commit '21871fa648bfa17f00386e2b0c49946daa51706c' into dora 2015-02-20 12:40:50 +01:00
Harald Welte 4c10771fc4 Merge commit 'f47375cb49cd2d7cd41022e116ed089c5537bc00' into dora 2015-02-20 12:36:01 +01:00
Harald Welte 07f3875919 Merge commit 'b386e617120844046e46b1178ba665bb6e1f5217' into dora 2015-02-20 12:32:06 +01:00
Harald Welte c631f3ea01 Merge commit '823aa457c690c24ad835618a457932a1b4ab738d' into dora 2015-02-20 12:28:24 +01:00
Harald Welte f176345e8e Merge commit '979f16d1b1b522c677e1578aa7b0779805d99eb6' into dora 2015-02-20 12:27:17 +01:00
Harald Welte db89f2037b Merge commit '74b87851e194827cc0db9dd87203bed4784fa3d0' into dora 2015-02-20 12:19:11 +01:00
Harald Welte 4998486b95 Merge commit '38d1587db55d0bad2a6cf32a7939998738a899a2' into dora 2015-02-20 11:33:48 +01:00
Holger Hans Peter Freyther bfdac72642 Merge commit '9e6e792ec1df919d040a7f8436d03016e364a078' into dora 2015-02-15 15:03:33 +01:00
Holger Hans Peter Freyther 6b2acc8c39 Merge commit '592c6d7295a24cd49bbf49fcbc089d261bc286af' into dora 2015-02-15 14:43:03 +01:00