Merge upstream.
authorMahmoud Hossam <mahmoud.h.hanafy@gmail.com>
Sun, 6 May 2012 04:26:52 +0000 (06:26 +0200)
committerMahmoud Hossam <mahmoud.h.hanafy@gmail.com>
Sun, 6 May 2012 04:26:52 +0000 (06:26 +0200)
1  2 
docs/shipping/packaging.rst

Simple merge