deajan
|
19c15d2265
|
Bumped version to v1.2 final
|
2017-03-23 23:02:43 +01:00 |
|
deajan
|
d9d7bd9f3c
|
Added MINGW64 to supported OS list
|
2017-03-23 21:05:38 +01:00 |
|
deajan
|
fa0e194819
|
Made TSTAMP more readable
|
2017-03-13 13:07:16 +01:00 |
|
deajan
|
24d76f1888
|
Prevent possibility to run remote cmds on local runs
|
2017-02-13 12:47:46 +01:00 |
|
deajan
|
baaf1a621a
|
Bumped version to v1.2RC3
|
2017-02-10 11:53:01 +01:00 |
|
deajan
|
81438ce2fd
|
Imported funny _REMOTE_TOKEN obfuscation from obackup :)
|
2017-02-10 11:14:11 +01:00 |
|
deajan
|
15e1d7fbe0
|
Updated ofunctions from obackup
|
2017-02-09 13:02:44 +01:00 |
|
deajan
|
4135c59869
|
Added _REMOTE_TOKEN for ssh_filter
|
2017-02-08 13:52:04 +01:00 |
|
deajan
|
77e4a05613
|
Bumped version to v1.2RC2
|
2017-02-08 08:39:26 +01:00 |
|
deajan
|
839c287ec9
|
Better BSD ping when not root
|
2017-02-07 22:28:54 +01:00 |
|
deajan
|
2a63707cf7
|
Quick ping fix for FreeBSD non root
|
2017-02-07 22:24:54 +01:00 |
|
deajan
|
1e7a8d643c
|
Improved os detection
|
2017-02-07 22:04:36 +01:00 |
|
deajan
|
e201217935
|
Fixed inline messages when encoding used
|
2017-02-05 13:24:17 +01:00 |
|
deajan
|
6031036ae1
|
Trying to resolve mail encoding issues
|
2017-02-05 13:11:00 +01:00 |
|
deajan
|
69f8945806
|
Fix for escaped UTF-8 characters in log files
|
2017-02-03 14:09:14 +01:00 |
|
deajan
|
1653a6da57
|
Added vercomp function
|
2017-02-03 12:00:03 +01:00 |
|
deajan
|
6fc4bef224
|
Updated ofunctions from obackup
|
2017-01-04 09:17:49 +01:00 |
|
deajan
|
4c6ada2388
|
Added small fixes from obackup
|
2016-12-28 23:37:07 +01:00 |
|
deajan
|
07daa13517
|
Some minor fixes from obackup
|
2016-12-23 20:41:52 +01:00 |
|
deajan
|
79402ef2da
|
Updated ofunctions from obackup
|
2016-12-23 18:25:08 +01:00 |
|
deajan
|
266b35d81b
|
Fixing typos
|
2016-12-19 22:39:03 +01:00 |
|
deajan
|
97a1aa5e05
|
Updated sudo behavior
|
2016-12-19 13:19:21 +01:00 |
|
deajan
|
eee2bdf565
|
Made critical error message more readable
|
2016-12-15 11:53:22 +01:00 |
|
deajan
|
caccb04c06
|
Fixed RemoteLogger prefix
|
2016-12-13 18:31:17 +01:00 |
|
deajan
|
69568e8132
|
Removed unnecessary code
|
2016-12-13 12:41:42 +01:00 |
|
deajan
|
28dbd94ce0
|
Misc changes
|
2016-12-13 12:29:33 +01:00 |
|
deajan
|
8fbe4d716d
|
Added RSYNC_OPTIONAL_ARGS parameter
|
2016-12-13 09:18:47 +01:00 |
|
deajan
|
68d0306713
|
Minor fix
|
2016-12-12 23:42:29 +01:00 |
|
deajan
|
486f63043d
|
Fixed stupid typos
|
2016-12-12 11:38:27 +01:00 |
|
deajan
|
a3af29804d
|
Fixed missing env variables for remote calls
|
2016-12-12 11:16:53 +01:00 |
|
deajan
|
4d52f71061
|
Added some degree of randomisation on RUN_DIR files
|
2016-12-12 10:14:59 +01:00 |
|
deajan
|
b8b648f9b8
|
Missing fi
|
2016-12-12 09:37:17 +01:00 |
|
deajan
|
5e52049bae
|
Disable rsync --skip-compress on MacOS
|
2016-12-12 09:36:10 +01:00 |
|
deajan
|
5c4b76ab9e
|
Reverted simplification of remote stat
|
2016-12-12 08:57:31 +01:00 |
|
deajan
|
d031a5504b
|
Fixed skip-compress regex not liked by bsd
|
2016-12-11 22:44:01 +01:00 |
|
deajan
|
bd28ca8837
|
Minor changes & fixes
|
2016-12-11 22:40:27 +01:00 |
|
deajan
|
c3894b7694
|
Multiple typo fixes and shellcheck improvements
|
2016-12-11 21:57:13 +01:00 |
|
deajan
|
23cac5cad6
|
Unexpanded all source files
|
2016-12-11 20:54:40 +01:00 |
|
deajan
|
7bc93df5e6
|
Fixed RemoteLogger debugging
|
2016-12-11 17:07:34 +01:00 |
|
deajan
|
cc4636e298
|
Remote logging debug improvements
|
2016-12-11 14:29:17 +01:00 |
|
deajan
|
63bee68be0
|
Added android to OS exclusion list for ACL sync
|
2016-12-11 11:48:41 +01:00 |
|
deajan
|
f11cc81c01
|
File attrib skip logic fix
|
2016-12-11 11:38:36 +01:00 |
|
deajan
|
0761f15b22
|
Switched to new rsync compression, added excluded extensions, fix ACL for busybox
|
2016-12-11 11:33:42 +01:00 |
|
deajan
|
852ff0adf5
|
Reverted openssl silent becauce sendmail: NOOP failed
|
2016-12-10 18:40:36 +01:00 |
|
deajan
|
d2be7e43a8
|
Fixing typos and rendering openssl silent
|
2016-12-10 18:39:25 +01:00 |
|
deajan
|
c9635d48d3
|
Fixed ambiguous redirect
|
2016-12-10 18:37:18 +01:00 |
|
deajan
|
c5d83a18bf
|
quick and dirty debug test
|
2016-12-10 18:31:39 +01:00 |
|
deajan
|
4e61b23cc5
|
Various typo fixes + arrayToString fix
|
2016-12-10 18:27:56 +01:00 |
|
deajan
|
72dfd4e94c
|
Fixes in android email sending
|
2016-12-10 18:07:00 +01:00 |
|
deajan
|
9bce1a7f1c
|
Less code for spinner
|
2016-12-09 21:54:42 +01:00 |
|
deajan
|
4308678cc2
|
Smaller spinner code
|
2016-12-09 21:44:57 +01:00 |
|
deajan
|
229a9800cc
|
Make difference between msys and cygwin
|
2016-12-09 19:19:52 +01:00 |
|
deajan
|
a543099eed
|
Added msys2 detection and bootstrap safe code
|
2016-12-08 22:06:36 +01:00 |
|
deajan
|
31b1f0791a
|
Added comment
|
2016-12-08 10:58:59 +01:00 |
|
deajan
|
ce6b674ba3
|
Minor function renames
|
2016-12-08 08:58:56 +01:00 |
|
deajan
|
731fc81abf
|
Made ofunctions "includable"
|
2016-12-07 21:30:10 +01:00 |
|
deajan
|
7e44139325
|
Minor adjustment to _Logger
|
2016-12-07 11:45:34 +01:00 |
|
deajan
|
226bf33e29
|
Code compliance on ArrayContains
|
2016-12-06 23:24:02 +01:00 |
|
deajan
|
bdf72843ee
|
Added ofunctions header for next branch identification
|
2016-12-04 11:11:35 +01:00 |
|
deajan
|
078d47403f
|
Reorganized function chronology
|
2016-12-04 11:10:02 +01:00 |
|
deajan
|
a87c44b9dc
|
Rendered WaitForTaskCompletion global output thread safe
|
2016-12-03 10:40:30 +01:00 |
|
deajan
|
3128cb1841
|
Added global var HARD_MAX_EXEC_TIME_REACHED
|
2016-12-03 10:06:15 +01:00 |
|
deajan
|
a7e41410e9
|
Removed unnecessary comments
|
2016-12-03 09:47:51 +01:00 |
|
deajan
|
88b135118d
|
Coped with really old TODO fixing rsyncpatterns when path separator isn't semicolon
|
2016-12-03 09:39:09 +01:00 |
|
deajan
|
01c62aa4ca
|
Multiple recipient compat for mutt
|
2016-12-01 21:27:28 +01:00 |
|
deajan
|
9bb849dec7
|
Quick paranoia debug fix
|
2016-12-01 19:50:06 +01:00 |
|
deajan
|
b8f38152d5
|
Soft time alerts aren't anymore redundant when counting=false
|
2016-11-29 22:43:28 +01:00 |
|
deajan
|
745688d982
|
Improved timed execution of sync function
|
2016-11-29 20:28:00 +01:00 |
|
deajan
|
8ee4b824da
|
Work on WaitForTaskCompletion hard exec time
|
2016-11-25 22:15:27 +01:00 |
|
deajan
|
804a284cb3
|
Updated parallelexec and fixed soft max time enforcement
|
2016-11-24 13:26:32 +01:00 |
|
deajan
|
a0fd7941c7
|
Changed to more clear WaitForTaskCompletion & ParallelExec argument list
|
2016-11-24 09:40:33 +01:00 |
|
deajan
|
3a3e7cfa02
|
Disabling ACL / XATTR on Mac & msys
|
2016-11-22 19:45:53 +01:00 |
|
deajan
|
c3013347bb
|
Fixing OS detection on Cygwin
|
2016-11-22 19:02:13 +01:00 |
|
deajan
|
b3d17f8fec
|
Fixed WinNT10 detection
|
2016-11-22 18:50:09 +01:00 |
|
deajan
|
15630c4b6d
|
msys/cygwin don't know about process states
|
2016-11-22 18:18:35 +01:00 |
|
deajan
|
7e8463ec50
|
Fixing typos
|
2016-11-22 17:43:43 +01:00 |
|
deajan
|
9fb9d3504e
|
Added Win10 bash detection
|
2016-11-22 17:41:06 +01:00 |
|
deajan
|
6d0e7cd0c7
|
Updated WaitForTaskcompletion to emulate wait
|
2016-11-22 17:19:30 +01:00 |
|
deajan
|
85466e0ab0
|
Added MAX_WAIT support for MacOS daemon mode
|
2016-11-21 19:18:22 +01:00 |
|
deajan
|
2b8fe18217
|
Disable ACL and XATTR preserve by default on Mac
|
2016-11-21 15:13:15 +01:00 |
|
deajan
|
eec2df90e3
|
Fixed old executability exclusion on MacOS
|
2016-11-21 14:48:02 +01:00 |
|
deajan
|
4dd007ae56
|
Render SendEmail function MacOS compatible
|
2016-11-21 14:04:05 +01:00 |
|
deajan
|
5ec5d01dca
|
Fixed possible issue if global var toggle is used
|
2016-11-20 22:18:36 +01:00 |
|
deajan
|
0718eb6f60
|
More optional checks to remove if not paranoia debug
|
2016-11-20 17:43:13 +01:00 |
|
deajan
|
325c4e5d5c
|
GetRemoteOS executed anyway
|
2016-11-19 13:13:08 +01:00 |
|
deajan
|
6efe00938b
|
Better android detection
|
2016-11-19 12:37:33 +01:00 |
|
deajan
|
2488b1ece7
|
Removed debugging exit
|
2016-11-17 21:19:59 +01:00 |
|
deajan
|
557bfb097d
|
Removed unncecessary code
|
2016-11-17 21:02:45 +01:00 |
|
deajan
|
853f2692dd
|
Some work on Logger function
|
2016-11-17 20:00:23 +01:00 |
|
deajan
|
c155e0ccf5
|
SLEEP_TIME default value
|
2016-11-17 14:02:34 +01:00 |
|
deajan
|
752d7f3bb9
|
Logger now creates flag files
|
2016-11-15 21:26:52 +01:00 |
|
deajan
|
75e6a58580
|
Fixed typo and removed unneeded code
|
2016-11-15 13:14:41 +01:00 |
|
deajan
|
2200611e23
|
Cosmetic change
|
2016-11-15 13:11:35 +01:00 |
|
deajan
|
6cc1286fe9
|
Allow set external sleep time in debug mode
|
2016-11-15 12:24:42 +01:00 |
|
deajan
|
9cafba436d
|
Refactor GetRemoteOS
|
2016-11-14 23:10:37 +01:00 |
|
deajan
|
076ace4b43
|
Fixed TrapError shell color
|
2016-11-14 22:04:54 +01:00 |
|
deajan
|
6bdd5b0a1a
|
Added color to TrapError output
|
2016-11-14 22:01:44 +01:00 |
|
deajan
|
63c64c5d5e
|
Added --summary and --no-prefix arguments
|
2016-11-14 19:17:30 +01:00 |
|
deajan
|
4fb0b5f5f7
|
Added ALWAYS loger option, also fixed boolean capitalization
|
2016-11-14 19:05:29 +01:00 |
|
deajan
|
7b9fde680e
|
Added error only support in Logger
|
2016-11-14 17:12:57 +01:00 |
|
deajan
|
16a717a8bb
|
Fixed debug trapError show warnings in IsNumeric functions when not numeric
|
2016-11-13 15:49:40 +01:00 |
|
deajan
|
4442c571f9
|
Refactored SendAlert and SendEmail
|
2016-11-12 00:30:25 +01:00 |
|
deajan
|
d9a3fa9427
|
Remove forgotten -f parameter
|
2016-11-10 16:16:38 +01:00 |
|
deajan
|
51fb8b8bac
|
Fixed alert log name when instance isn't kwnown yet
|
2016-11-10 15:54:59 +01:00 |
|
deajan
|
b461b5bc95
|
Fixed attachment command in SendEmail
|
2016-11-09 17:36:18 +01:00 |
|
deajan
|
d36ecd1f32
|
Fixed alert log filenames per instance
|
2016-11-09 17:31:31 +01:00 |
|
deajan
|
a464fa37a3
|
Implement TLS and SSL support for busybox sendmail
|
2016-10-23 20:25:46 +02:00 |
|
deajan
|
bddd7c87da
|
Updated ofunctions with better busybox support
|
2016-10-23 18:23:44 +02:00 |
|
deajan
|
0e897f66c5
|
Fixed HumanToNumeric function
|
2016-10-23 13:27:35 +02:00 |
|
deajan
|
0e049c4850
|
More busybox love
|
2016-10-23 10:44:27 +02:00 |
|
deajan
|
6665b7d9d9
|
Added remote busybox detection
|
2016-10-23 10:40:21 +02:00 |
|
deajan
|
97a1db5f55
|
Added HumanToNumeric function
|
2016-10-23 10:35:38 +02:00 |
|
deajan
|
fe2a3037f7
|
Cosmetic fix
|
2016-10-22 21:03:36 +02:00 |
|
deajan
|
101cb26549
|
Cosmetic fixes
|
2016-10-22 20:59:50 +02:00 |
|
deajan
|
4e73a17efa
|
More busybox fixes
|
2016-10-22 12:27:08 +00:00 |
|
deajan
|
84f266568d
|
pidState command busybox compat
|
2016-10-22 14:14:52 +02:00 |
|
deajan
|
1366b0c10c
|
Prefered C style boolean values
|
2016-10-21 15:29:49 +02:00 |
|
deajan
|
3ae961c4b9
|
Added arrayContains function
|
2016-10-21 12:37:38 +02:00 |
|
deajan
|
0be2bc3bc3
|
Updated ofunctions
|
2016-10-19 12:28:30 +02:00 |
|
deajan
|
951f6b1996
|
Allow default inclusion / exclusions for quicksync
|
2016-09-16 10:11:59 +02:00 |
|
deajan
|
4c3aa02954
|
Updated common scripts
|
2016-09-08 22:49:51 +02:00 |
|
deajan
|
4725bafb35
|
Improved ParallelExec
|
2016-09-06 19:27:45 +02:00 |
|
deajan
|
6e80c4772f
|
Improved ParallelExec functions
|
2016-09-06 19:08:53 +02:00 |
|
deajan
|
873ff7971f
|
Updated ofunctions with minor fixes
|
2016-09-05 22:06:57 +02:00 |
|
deajan
|
b94dd28a6c
|
Rebuilt targets
|
2016-09-02 21:43:14 +02:00 |
|
deajan
|
415c153683
|
Added some other paranoia debug checks
|
2016-08-30 11:49:21 +02:00 |
|
deajan
|
a31cceedc6
|
Made WaitFor and ParallelExec functions more robust
|
2016-08-30 11:37:25 +02:00 |
|
deajan
|
aa4b7dddc8
|
Fixed verbose logging
|
2016-08-29 19:03:19 +02:00 |
|
deajan
|
2764930dc4
|
Replaced 0/1 with bolean logic
|
2016-08-29 17:37:48 +02:00 |
|
deajan
|
385bc5d40f
|
Simplified verbose. Also replaced 0,1 with false,true
|
2016-08-29 13:48:03 +02:00 |
|
deajan
|
e019fb98f9
|
Added missing local declarations
|
2016-08-28 17:54:20 +02:00 |
|
deajan
|
32fbb24259
|
Updated ofunctions with ParallelExec
|
2016-08-28 11:32:25 +02:00 |
|
deajan
|
bcbd43fafb
|
Fixed code removal
|
2016-08-22 08:31:48 +02:00 |
|
deajan
|
df2cfe8fa5
|
Removed unused code
|
2016-08-22 08:12:08 +02:00 |
|
deajan
|
f052422c44
|
Prevent double kill in WaitForTaskCompletion
|
2016-08-22 08:09:48 +02:00 |
|
deajan
|
fd2dfabce2
|
Made signals posix compliant
|
2016-08-22 07:55:03 +02:00 |
|
deajan
|
fd08e00abb
|
Increased soft warn value for remote internet checks
|
2016-08-19 11:09:07 +02:00 |
|
deajan
|
416f2c1e45
|
Updated ofunctions from obackup project
|
2016-08-18 23:28:41 +02:00 |
|
deajan
|
959ac5bd50
|
Updated ofunctions
|
2016-08-13 11:56:54 +02:00 |
|
deajan
|
8b19d51042
|
Parallelized sync functions
|
2016-08-09 22:14:17 +02:00 |
|
deajan
|
06ca2f6a37
|
Fixed executability for macosX
|
2016-08-09 14:12:07 +02:00 |
|
deajan
|
0162721513
|
Added missing fi
|
2016-08-09 13:48:21 +02:00 |
|
deajan
|
1472fba4bc
|
Added initial preserve permissions
|
2016-08-09 13:44:43 +02:00 |
|
deajan
|
6f1307a4fd
|
Minor fixes in ofunctions
|
2016-08-08 18:06:31 +02:00 |
|
deajan
|
cdbad63e87
|
Updated ofunctions
|
2016-08-08 00:16:38 +02:00 |
|
deajan
|
bf0051c63d
|
Refactored wait functions
|
2016-08-07 23:54:46 +02:00 |
|
deajan
|
b16737e326
|
Fixed double pattern delcaration
|
2016-08-06 13:17:56 +02:00 |
|
deajan
|
c519639aec
|
more and more parallelisation
|
2016-08-04 00:52:05 +02:00 |
|
deajan
|
6f59e37e94
|
Paralellized run before / after functions
|
2016-08-04 00:28:09 +02:00 |
|
deajan
|
6bb5ab9c22
|
Various minor fixes
|
2016-08-03 23:58:24 +02:00 |
|
deajan
|
5c43179ef4
|
Multi pid wait and killchild functions
|
2016-08-03 10:02:07 +02:00 |
|
deajan
|
33467ca56c
|
Rebuild targets
|
2016-08-02 22:10:02 +02:00 |
|
deajan
|
7be29fdb05
|
New wait function handles multiple pids
|
2016-08-02 14:26:04 +02:00 |
|
deajan
|
b3935b43d3
|
Lowered sleep time
|
2016-07-27 11:49:21 +02:00 |
|
deajan
|
5880e1502f
|
Code cleanup
|
2016-07-19 13:41:36 +02:00 |
|
deajan
|
1bbd495e2a
|
Fix for #52
|
2016-07-19 10:52:43 +02:00 |
|
deajan
|
f727db8f86
|
Fixed sed -i for BSD & Mac
|
2016-05-26 22:11:00 +02:00 |
|
deajan
|
a4bdd5aa37
|
Finished windows support for generic mail sending function
|
2016-05-25 19:57:04 +02:00 |
|
deajan
|
186f293c94
|
Fixed installer paths
|
2016-04-14 18:01:56 +02:00 |
|
deajan
|
e1b1643b1a
|
More debugging love for KillChilds
|
2016-04-12 10:16:21 +02:00 |
|
deajan
|
e832cb700b
|
Fixed bogus debug if in Killchilds
|
2016-04-10 21:14:07 +02:00 |
|
deajan
|
0ca9b75085
|
Some msys/cygwin fixes
|
2016-04-08 21:10:54 +02:00 |
|
deajan
|
c21a109f19
|
Updated ofunctions.sh with userland logging
|
2016-04-06 20:13:19 +02:00 |
|
deajan
|
0d08c42ecd
|
Rendered sync_attr function BSD compatible
|
2016-04-03 16:06:45 +02:00 |
|
deajan
|
23b2347765
|
Removed typo file
|
2016-04-01 21:29:33 +02:00 |
|
deajan
|
5ae98f4fd4
|
Wronf ofunctions.sh uploaded
|
2016-03-31 22:41:51 +02:00 |
|
deajan
|
9a9d31ee66
|
Better time control and pid kill handling
|
2016-03-31 22:32:03 +02:00 |
|
deajan
|
433a72938f
|
Reverted using eval in SendAlert
|
2016-03-31 12:01:10 +02:00 |
|
deajan
|
0a43c1a120
|
Fixed bogus SSH_OPTS
|
2016-03-31 10:17:50 +02:00 |
|
deajan
|
fb53664877
|
Added systemd file, installer stats and ssh known host ignore option
|
2016-03-29 22:55:57 +02:00 |
|
deajan
|
b4f4a122c8
|
Added pfSense mail support and fixed FreeBSD install.sh
|
2016-03-22 12:43:01 +01:00 |
|
deajan
|
3a988bbfb7
|
Minor enhancement in os detection log
|
2016-03-20 16:53:18 +01:00 |
|
deajan
|
e41ddca8f7
|
Added cygwin to the list of supported OS
|
2016-03-20 16:47:51 +01:00 |
|
deajan
|
8428662d61
|
Added option to ignore unknown OS
|
2016-03-19 10:48:46 +01:00 |
|
deajan
|
d11bd61473
|
Some sanity code cleanup
|
2016-03-14 21:51:29 +01:00 |
|
deajan
|
b2b8539dff
|
Reduced log level for 3rdparty pings
|
2016-03-10 10:27:03 +01:00 |
|
deajan
|
7a485bd784
|
Bug fix for in tree_list error log failing for WaitForCompletion
|
2016-03-08 23:54:25 +01:00 |
|
deajan
|
9b573c7380
|
Move rsync patterns from osync to ofunctions
|
2016-02-21 11:12:41 +01:00 |
|
deajan
|
3626c4d049
|
Bug fixing last code cleanup
|
2016-02-19 21:44:52 +01:00 |
|
deajan
|
bb0562d3f0
|
More typo fixing here
|
2016-02-18 23:28:57 +01:00 |
|
deajan
|
5b15b19031
|
Fixed more typos
|
2016-02-18 20:54:07 +01:00 |
|
deajan
|
5fc500afc9
|
Preparing sync_attrs function
|
2016-02-16 22:15:44 +01:00 |
|
deajan
|
47fbcfd817
|
WIP on attr sync function
|
2016-02-16 20:52:53 +01:00 |
|
deajan
|
3c6c115a4b
|
Another typo bites the dust :(
|
2015-12-15 13:45:11 +01:00 |
|
deajan
|
7e0de0e5c0
|
Fixed more typos :(
|
2015-12-15 13:40:50 +01:00 |
|
deajan
|
03719ecb94
|
Upgrade script adds missing config file values
|
2015-12-15 13:18:46 +01:00 |
|
deajan
|
9fda36adb7
|
More fixes for GNU / non-GNU versions of mail command
|
2015-12-15 13:03:05 +01:00 |
|
deajan
|
941bf5bf08
|
Fixed subject in sendmail
|
2015-11-30 14:49:46 +01:00 |
|
deajan
|
c51908bc83
|
Added missing global config file value
|
2015-11-28 13:06:27 +01:00 |
|
deajan
|
4398c02f9d
|
Added rsync include patterns
|
2015-11-27 14:12:44 +01:00 |
|
deajan
|
d32699c492
|
Fixed function lib path.
|
2015-11-19 22:39:31 +01:00 |
|
deajan
|
7875469a94
|
Initial upload of function merge
|
2015-11-13 20:16:20 +01:00 |