Merge remote-tracking branch 'origin/master' into omaster
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Tue, 15 Apr 2014 06:11:47 +0000 (08:11 +0200)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Tue, 15 Apr 2014 06:11:47 +0000 (08:11 +0200)
commitebb6e03201ce0e5a00be7cff2e365ad3d6cb7195
treec0de44bc36de376bc18e88ba3bd42551bbd29546
parent3cb80840dbf9add2b5f9c26da9650da39e34906d
parentf27b44b7c271bda4ad3a0c4043bb709e0a4e4fbb
Merge remote-tracking branch 'origin/master' into omaster
st.c