Merge remote-tracking branch 'origin/master' into omaster
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Mon, 28 Oct 2013 18:18:24 +0000 (19:18 +0100)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Mon, 28 Oct 2013 18:18:24 +0000 (19:18 +0100)
commit3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32
tree88478e9071eed37ac3233c0857097dcbdfd6a0c7
parent297c886b72f4e9093973aaa14b66d392f6196634
parent489982d4b8442af25a380f8c22be542055cda81f
Merge remote-tracking branch 'origin/master' into omaster
st.c