Sync with lab
authorKirill Smelkov <kirr@nexedi.com>
Wed, 20 May 2015 07:27:23 +0000 (10:27 +0300)
committerKirill Smelkov <kirr@nexedi.com>
Wed, 20 May 2015 07:27:23 +0000 (10:27 +0300)
commitb44a8c42e61993a1b54c4c4c29b6dc52d437f8a9
treea6e4f9326877a660c632b01b41ac005c9e47505c
parent3776c36f20bff464ac0a3d3d6efc9c86cce907c6
parent2734c043478b0c49f179a8e703dc93565905dccc
Sync with lab

Merge branch 'master' of https://lab.nexedi.cn/nexedi/slapos

* 'master' of https://lab.nexedi.cn/nexedi/slapos:
  openssl: Allow it to be build with make -jN   N > 1
  openssl: Convert patches to -p1